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.

Sign up for GitHub

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

Jump to bottom

Upgrade Canal to v3.20 with k8s 1.22 support #12584

Merged
merged 2 commits into from
Oct 24, 2021
Merged

Upgrade Canal to v3.20 with k8s 1.22 support #12584

merged 2 commits into from
Oct 24, 2021

Conversation

rifelpet
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2021
@justinsb
Copy link
Member

Looks good, but do we want to create a new version? The changes do seem to be mostly around CRD going to v1, and that is available in 1.16, so I think it's OK either way..

@rifelpet
Copy link
Member Author

I just noticed this version requirement: https://docs.projectcalico.org/getting-started/kubernetes/requirements#supported-versions

It probably makes sense to give it a new version so that the untested k8s versions that kops still supports continue to use the older canal version. I'll update this later today

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2021
@rifelpet
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 24, 2021
@k8s-ci-robot k8s-ci-robot merged commit 7e58bdd into kubernetes:master Oct 24, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Oct 24, 2021
@johngmyers johngmyers mentioned this pull request Oct 24, 2021
Merged
k8s-ci-robot added a commit that referenced this pull request Oct 24, 2021
@k8s-ci-robot
Merge pull request #12589 from johngmyers/automated-cherry-pick-of-#1…
fc6fd36 
…2584-upstream-release-1.22

Automated cherry pick of #12584: Add canal 3.20 with k8s 1.22 support
@kforsthoevel kforsthoevel mentioned this pull request Nov 15, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johngmyers johngmyers johngmyers approved these changes

@KashifSaadat KashifSaadat Awaiting requested review from KashifSaadat

@olemarkus olemarkus Awaiting requested review from olemarkus

Assignees

@johngmyers johngmyers

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rifelpet @justinsb @k8s-ci-robot @johngmyers