[release-4.14][manual] kubeletconfig: ignore nonmatching kubeletconfig objects #903
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
fix copy/paste mistake which triggered reconciliation with the wrong key. Signed-off-by: Francesco Romani <fromani@redhat.com> (cherry picked from commit 4e4c92c)
In 3caa829 we added support to handle gracefully payload-less kubeletconfig objects. There's however another issue lurking: we can have multiple kubeletconfig objects. Previously, the code was incorrectly assuming there is at most one kubeletconfig object in the cluster, targeting the MCP worker pool. But we can actually have more kubeletconfig objects as long as they don't target overlapping MCPs (e.g. with 2 MCPs we can have 2 kubeletconfig objects, say, or perhaps even 4 considering payloadles objects). Thus, we need to fix our matching logic to handle this occurrence. The fix is simple: just look for kubeletconfig which we target NodeGroups we are interested into, silently skipping everything else. e2e tests are pending and will be added in a separate commit. Signed-off-by: Francesco Romani <fromani@redhat.com> (cherry picked from commit ee717aa)
add labels to easily infer which MCP and which NROP instance are linked to a generated configmap The OwnerReference is already correctly set to handle the cascading delete, we need more soft links between objects and labels seems a good and natural fit. We plan to use these labels for troubleshooting and in the e2e tests. Signed-off-by: Francesco Romani <fromani@redhat.com> (cherry picked from commit ada1095)
add e2e tests to make sure the nonmatching kubeletconfigs (e.g. kubeletconfigs which are not linked to NodeGroups the operator monitors) are safely skipped. Signed-off-by: Francesco Romani <fromani@redhat.com> (cherry picked from commit f7e4d06)
|
/cherry-pick release-4.13 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ffromani 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 |
openshift-ci
bot
added
the
approved
|
@ffromani: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/lgtm |
|
@ffromani: #903 failed to apply on top of branch "release-4.13": In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
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.
This is a manual cherry-pick of #885