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: use "--config" for kubeadm "reset" and "upgrade" #3086

Merged

Conversation

neolit123
Copy link
Member

When executing "kubeadm reset" or "kubeadm upgrade", if the kubeadm version is 1.31 (or pre-release) pass the "--config" flag with the v1beta4 kinds. Else,
continue to call the flags for a given command.

Additionally:

  • Call "kubeadm upgrade diff" on the primary CP node after calling "upgrade plan".
  • Fallback to the /kinder/upgrade/version during upgrade if the provided version is different.

includes some smaller improvements like printing a config that is prepared for a command on multiple lines.

xref #2890

@neolit123 neolit123 added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. area/test kind/feature Categorizes issue or PR as related to a new feature. labels Jul 1, 2024
@neolit123 neolit123 added this to the v1.31 milestone Jul 1, 2024
@neolit123 neolit123 requested review from pacoxu and SataQiu July 1, 2024 15:24
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kinder Issues to track work in the kinder tool labels Jul 1, 2024
@k8s-ci-robot k8s-ci-robot requested a review from carlory July 1, 2024 15:24
@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 Jul 1, 2024
@neolit123
Copy link
Member Author

/hold for review

@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 Jul 1, 2024
When executing "kubeadm reset" or "kubeadm upgrade",
if the kubeadm version is 1.31 (or pre-release) pass
the "--config" flag with the v1beta4 kinds. Else,
continue to call the flags for a given command.

Additionally:
- Call "kubeadm upgrade diff" on the primary CP
node after calling "upgrade plan".
- Fallback to the /kinder/upgrade/version during
upgrade if the provided version is different.
@neolit123 neolit123 force-pushed the 1.31-enable-v1nbeta4-in-kinder branch from 4bdf7a3 to fa5ac66 Compare July 1, 2024 15:34
@SataQiu
Copy link
Member

SataQiu commented Jul 7, 2024

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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

/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 Jul 7, 2024
@k8s-ci-robot k8s-ci-robot merged commit 0d0a072 into kubernetes:main Jul 7, 2024
4 checks passed
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. area/kinder Issues to track work in the kinder tool area/test 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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants