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

kubeadm: disallow the mixture of --config and --patches & remove deprecated --experimental-patches #104065

Merged
merged 2 commits into from Aug 11, 2021
Merged

kubeadm: disallow the mixture of --config and --patches & remove deprecated --experimental-patches #104065

merged 2 commits into from Aug 11, 2021

Conversation

pacoxu
Copy link
Member

@pacoxu pacoxu commented Aug 2, 2021 •
edited

What type of PR is this?

/kind feature
/area kubeadm
/sig cluster-lifecycle
milestone 1.23

Which issue(s) this PR fixes:

follow up of #103063
part of kubernetes/kubeadm#2046

Does this PR introduce a user-facing change?

ACTION REQUIRED: kubeadm: remove the deprecated flag --experimental-patches for the init|join|upgrade commands. The flag --patches is no longer allowed in a mixture with the flag --config. Please use the kubeadm configuration for setting patches for a node using {Init|Join}Configuration.patches.

- [KEP]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/kubeadm/1739-customization-with-patches

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. area/kubeadm size/S Denotes a PR that changes 10-29 lines, ignoring generated files. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 2, 2021
@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 2, 2021
neolit123
neolit123 reviewed Aug 2, 2021
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/triage accepted
/priority important-soon
/milestone v1.23

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Aug 2, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Aug 2, 2021
@k8s-ci-robot k8s-ci-robot removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Aug 2, 2021
@neolit123
Copy link
Member

thanks @pacoxu
i will have a more detailed look after code freeze is lifted.

/retest

@neolit123
Copy link
Member

neolit123 commented Aug 3, 2021 •
edited

@pacoxu
we need to do this action item first:

from:
kubernetes/kubeadm#2046

or the kubeadm periodic jobs for patches will start failing.

@neolit123 neolit123 mentioned this pull request Aug 3, 2021
Open
14 tasks
@pacoxu pacoxu mentioned this pull request Aug 3, 2021
Merged
@pacoxu
Copy link
Member Author

pacoxu commented Aug 3, 2021 •
edited

Try to fix https://github.com/kubernetes/kubeadm/tree/master/kinder/pkg/cluster/manager/actions in kubernetes/kubeadm#2537. Need some test.

@pacoxu pacoxu requested a review from neolit123 August 11, 2021 02:03
@pacoxu
Copy link
Member Author

pacoxu commented Aug 11, 2021

This PR is ready to review since kubernetes/kubeadm#2537 is merged.

@neolit123
Copy link
Member

ACTION REQUIRED: kubeadm: the flag --patches is no longer allowed in a mixture with the flag --config. Please use the kubeadm configuration for setting patches for a node using {Init|Join}Configuration.patches.

we should update the release note that the experimental flag is being removed:

ACTION REQUIRED: kubeadm: remove the deprecated flag --experimental-patches for the init|join|upgrade commands. The flag --patches is no longer allowed in a mixture with the flag --config. Please use the kubeadm configuration for setting patches for a node using {Init|Join}Configuration.patches.

other than that:
/lgtm
/approve
/hold

please remove the hold once the RN is updated.

@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 Aug 11, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 11, 2021
@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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2021
@pacoxu
Copy link
Member Author

pacoxu commented Aug 11, 2021

/hold cancel
release note is updated.

@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 Aug 11, 2021
@k8s-ci-robot k8s-ci-robot merged commit 746fea5 into kubernetes:master Aug 11, 2021
@pacoxu pacoxu deleted the kubeadm-patches branch May 10, 2022 06:30
Tassatux added a commit to enix/ansible-kubeadm that referenced this pull request Nov 18, 2022
@Tassatux
Handle --patches option removed in 1.23
ef023d0 
kubernetes/kubernetes#104065
Tassatux added a commit to enix/ansible-kubeadm that referenced this pull request Nov 22, 2022
@Tassatux
Handle --patches option removed in 1.23
12cf747 
kubernetes/kubernetes#104065
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RA489 RA489 Awaiting requested review from RA489

@SataQiu SataQiu Awaiting requested review from SataQiu

@neolit123 neolit123 Awaiting requested review from neolit123

Assignees

@neolit123 neolit123

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm 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. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. 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. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pacoxu @neolit123 @k8s-ci-robot