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

[kubernetes] support 1.24.x #8935

Merged
merged 15 commits into from
Jun 15, 2022

Conversation

cristicalin
Copy link
Contributor

@cristicalin cristicalin commented Jun 6, 2022

What type of PR is this?

/kind feature

What this PR does / why we need it:
This PR makes kubernetes 1.24 the new default version, it drops support for 1.21.x and ensures that all supported container managers are still working by pinning cri-dockerd as the replacement for dockershim (see kubernetes/kubernetes@6c6c7e5 for details)

Which issue(s) this PR fixes:

Fixes #8924 #8953

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

[kubernetes] make 1.24.x the new default
[kubernetes] drop support for 1.21.x
[kubernetes] drop support for deprecated dynamic_kubelet_configuration 
[docker] use cri-dockerd instead of dockershim by default
[calico] drop support for 3.19.x and 3.20.x
[cri-o] add support for 1.24.x required by kubernetes 1.24.x

@cristicalin cristicalin added the tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. label Jun 6, 2022
@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 6, 2022
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 6, 2022
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

Need to mention about the option dynamic_kubelet_configuration has been removed in the release-note.

/cc @oomichi

@@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you consider also renaming the templates files to v1beta3?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, I'm trying to get a CI job failure out of the way first but will do this as well.

@cristicalin
Copy link
Contributor Author

/retest

@cristicalin cristicalin force-pushed the kube_1.24 branch 8 times, most recently from 5da40cb to b8cac9c Compare June 9, 2022 20:01
@cristicalin cristicalin marked this pull request as draft June 9, 2022 20:11
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 9, 2022
@cristicalin cristicalin force-pushed the kube_1.24 branch 6 times, most recently from 8fe14f2 to d38500f Compare June 10, 2022 15:28
@cristicalin cristicalin force-pushed the kube_1.24 branch 4 times, most recently from 926106f to 39ccc3a Compare June 13, 2022 20:39
* use new artifact release name
* enable cri-dockerd dual setack support if enable_dual_stack_networks
…sion deployed with docker as the container_manager
* extra admission controls now don't have a version in their file names
  eventratelimit.v1beta2.yaml.j2 -> eventratelimit.yaml.j2
* cri_socket variable includes the unix:// prefix to be conformat with
  upstream
@cristicalin cristicalin marked this pull request as ready for review June 14, 2022 08:59
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 14, 2022
@cristicalin
Copy link
Contributor Author

This is now ready for review.

/cc @oomichi @floryut

Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/lgtm

Ok let's go! thanks @cristicalin

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, floryut

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:
  • OWNERS [cristicalin,floryut]

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

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Kubelet 1.24.x can't start due to removed --network-plugin flag
6 participants