Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Canal/Calico to v3.23.5 #2538

Merged
merged 1 commit into from
Dec 9, 2022
Merged

Update Canal/Calico to v3.23.5 #2538

merged 1 commit into from
Dec 9, 2022

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Dec 9, 2022

What this PR does / why we need it:

This PR updates Calico as part of the cni-canal addon to v3.23.5. This Calico release is supposed to fix an issue where Calico pods are crashing after upgrading from an older Calico version to a newer one (projectcalico/calico#6442).

What type of PR is this?

/kind feature

Does this PR introduce a user-facing change? Then add your Release Note here:

Update Canal to v3.23.5. This Canal release is supposed to fix an issue where Calico pods are crashing after upgrading from an older Calico version to a newer one (see the [Known Issues](https://docs.kubermatic.com/kubeone/v1.5/known-issues/) document for more details)

Documentation:

https://github.com/kubermatic/docs/pull/1281

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
@kubermatic-bot kubermatic-bot added kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/tbd Denotes a PR that needs documentation (change) that will be done later. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 9, 2022
@xmudrii
Copy link
Member Author

xmudrii commented Dec 9, 2022

/cherrypick release/v1.5

@kubermatic-bot
Copy link
Contributor

@xmudrii: once the present PR merges, I will cherry-pick it on top of release/v1.5 in a new PR and assign it to you.

In response to this:

/cherrypick release/v1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot kubermatic-bot added docs/provided Denotes a PR that has a valid documentation reference. and removed docs/tbd Denotes a PR that needs documentation (change) that will be done later. labels Dec 9, 2022
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2022
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 291900f6b41e48a17f8aeb374bdbeeec530f61a5

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2022
@kubermatic-bot kubermatic-bot merged commit 6ed41d5 into main Dec 9, 2022
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.6 milestone Dec 9, 2022
@kubermatic-bot kubermatic-bot deleted the update-calico branch December 9, 2022 14:26
@kubermatic-bot
Copy link
Contributor

@xmudrii: #2538 failed to apply on top of branch "release/v1.5":

Applying: Update Canal/Calico to v3.23.5
.git/rebase-apply/patch:46: trailing whitespace.
      - watch 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	addons/cni-canal/canal.yaml
M	pkg/templates/images/images.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/templates/images/images.go
CONFLICT (content): Merge conflict in pkg/templates/images/images.go
Auto-merging addons/cni-canal/canal.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Canal/Calico to v3.23.5
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@xmudrii xmudrii added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/provided Denotes a PR that has a valid documentation reference. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants