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

Use Calico v3.23 for Kubernetes 1.22+ #13901

Merged
merged 2 commits into from
Jun 29, 2022
Merged

Use Calico v3.23 for Kubernetes 1.22+ #13901

merged 2 commits into from
Jun 29, 2022

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 28, 2022 •
edited
Loading

Ref: https://projectcalico.docs.tigera.io/getting-started/kubernetes/requirements#supported-versions

We test Calico v3.23 against the following Kubernetes versions.

  • v1.21
  • v1.22
  • v1.23

@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 Jun 28, 2022
@k8s-ci-robot k8s-ci-robot requested review from olemarkus and zetaab June 28, 2022 15:04
@hakman
Copy link
Member Author

hakman commented Jun 28, 2022

/hold for feedback from @seh

@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 Jun 28, 2022
@hakman hakman force-pushed the calico_single_manifest branch 2 times, most recently from 78fc7aa to 3b52356 Compare June 29, 2022 03:12
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 29, 2022
@hakman hakman changed the title Use Calico v3.23 for all Kubernetes versions Use Calico v3.23 for Kubernetes 1.21+ Jun 29, 2022
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/hold cancel

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 29, 2022
@hakman hakman force-pushed the calico_single_manifest branch from 237153f to 876ecad Compare June 29, 2022 03:44
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 29, 2022
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/hold for #13908 to be merged first

@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 Jun 29, 2022
@hakman hakman mentioned this pull request Jun 29, 2022
Closed
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

Looks like the Calico upgrade is more complicated.
/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 Jun 29, 2022
@hakman hakman mentioned this pull request Jun 29, 2022
Closed
@hakman hakman force-pushed the calico_single_manifest branch from 876ecad to bff2f17 Compare June 29, 2022 08:31
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 29, 2022
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/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 Jun 29, 2022
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/hold cancel

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jun 29, 2022
@hakman hakman force-pushed the calico_single_manifest branch from bff2f17 to 4103399 Compare June 29, 2022 11:32
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 29, 2022
@hakman hakman requested a review from olemarkus June 29, 2022 11:34
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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

@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/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 Jun 29, 2022
@hakman hakman force-pushed the calico_single_manifest branch from 4103399 to 520bd1e Compare June 29, 2022 14:19
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2022
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/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 Jun 29, 2022
@hakman hakman changed the title Use Calico v3.23 for Kubernetes 1.21+ Use Calico v3.23 for Kubernetes 1.22+ Jun 29, 2022
@olemarkus
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2022
@hakman
Copy link
Member Author

hakman commented Jun 29, 2022

/retest

@k8s-ci-robot k8s-ci-robot merged commit e403bee into kubernetes:master Jun 29, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Jun 29, 2022
@hakman hakman deleted the calico_single_manifest branch June 29, 2022 20:00
@hakman hakman mentioned this pull request Jul 12, 2022
Merged
k8s-ci-robot added a commit that referenced this pull request Jul 12, 2022
@k8s-ci-robot
Merge pull request #13968 from hakman/automated-cherry-pick-of-#13901…
f926b67 
…-upstream-release-1.24

Automated cherry pick of #13901: Use Calico v3.23 for Kubernetes 1.22+
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olemarkus olemarkus olemarkus approved these changes

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@olemarkus olemarkus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.
3 participants
@hakman @k8s-ci-robot @olemarkus