Support removal of managed node labels #15650
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kops-controller manages a few node-role node-labels. We now remove any extra managed labels that land on the node. This means we will now actively remove the extra node label if we previously erroneously applied to a control-plane node; previous code changes stopped applying it.
k8s-ci-robot
added
cncf-cla: yes
johngmyers
reviewed
Jul 17, 2023
| @@ -132,12 +132,23 @@ func (r *LegacyNodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) | |||
| } | |||
| } | |||
|
|
|||
| if len(updateLabels) == 0 { | |||
| deleteLabels := make(map[string]struct{}) | |||
There was a problem hiding this comment.
Why not use a k8s.io/utils/set/set.Set[string]?
johngmyers
approved these changes
Jul 17, 2023
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: johngmyers 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 |
k8s-ci-robot
added
the
approved
This was referenced Jul 17, 2023
|
/retest |
k8s-ci-robot
added a commit
that referenced
this pull request
Jul 17, 2023
…5650-upstream-release-1.27 Automated cherry pick of #15650: Support removal of managed node labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
kops-controller manages a few node-role node-labels. We
now remove any extra managed labels that land on the node.
This means we will now actively remove the extra node label if we
previously erroneously applied to a control-plane node; previous code
changes stopped applying it.