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

kinder: add handling of the new/old kubelet-config map #2654

Merged

Conversation

neolit123
Copy link
Member

@neolit123 neolit123 commented Feb 9, 2022

With UnversionedKubeletConfigMap going Beta in 1.24
and enabled by default, we want to match what kubeadm is doing:

  • look of the new name of CM
  • if that fails fallback to the old CM name

leave a TODO to remove this extra handling once 1.24
goes out of support. This would mean that all tested
versions of kubeadm only have UnversionedKubeletConfigMap=true
and the new CM name.

xref #1582
xref kubernetes/kubernetes#108027
(does not depend strictly on the this PR)

NOTE: i'm not touching the only e2e test workflow for this because it already excercises the case for upgrading from a state with old names -> new names.
https://github.com/kubernetes/kubeadm/blob/main/kinder/ci/workflows/unversioned-kubelet-cm-tasks.yaml#L113-L125
we can technically add a new workflow with the FG turned off and tested during init, but i don't think that is necessary.

With UnversionedKubeletConfigMap going Beta in 1.24
and enabled by default, we want to match what kubeadm is doing:
- look of the new name of CM
- if that fails fallback to the old CM name

leave a TODO to remove this extra handling once 1.24
goes out of support. This would mean that all tested
versions of kubeadm only have UnversionedKubeletConfigMap=true
and the new CM name.
@neolit123 neolit123 added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. labels Feb 9, 2022
@neolit123 neolit123 added this to the v1.24 milestone Feb 9, 2022
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 9, 2022
@k8s-ci-robot k8s-ci-robot added sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 9, 2022
Copy link
Member

@pacoxu pacoxu left a comment

Choose a reason for hiding this comment

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

/lgtm

since this is only used by node up-gradation.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123, pacoxu

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

@neolit123
Copy link
Member Author

let's merge this to let it run in CI.
/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 Feb 14, 2022
@k8s-ci-robot k8s-ci-robot merged commit 93178e6 into kubernetes:main Feb 14, 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. 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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. 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