馃悰 topology should not generate empty patch for metadata #5580
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
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/L
vincepri
approved these changes
Nov 3, 2021
| @@ -42,7 +40,7 @@ func (m *Metadata) Get(obj *unstructured.Unstructured) (*clusterv1.ObjectMeta, e | |||
| return nil, errors.Wrap(err, "failed to retrieve control plane metadata.labels") | |||
| } | |||
| if !ok { | |||
| return nil, errors.Errorf("%s not found", "."+strings.Join(labelsPath, ".")) | |||
| labelsValue = map[string]string{} | |||
There was a problem hiding this comment.
Was this done to avoid nil maps?
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: vincepri 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
sbueringer
reviewed
Nov 4, 2021
| @@ -42,7 +40,7 @@ func (m *Metadata) Get(obj *unstructured.Unstructured) (*clusterv1.ObjectMeta, e | |||
| return nil, errors.Wrap(err, "failed to retrieve control plane metadata.labels") | |||
| } | |||
| if !ok { | |||
There was a problem hiding this comment.
@fabriziopandini I agree that we shouldn't return an error here, but wouldn't it be more consistent overall and with e.g. mergeMap if we would return nil label/annotations if they are not set?
(the controller runtime client also sets empty maps to nil when it returns a resource)
fabriziopandini
deleted the
topology-should-not-generate-empty-metadata
branch
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.
What this PR does / why we need it:
While testing ClusterClass handling of metadata I have found that under certain conditions the generated patch has an empty map, something like {"metadata":{"annotations":{}}}. This leads to topology reconcile assuming that the patch is not empty, and thus trying to patch an object indefinitely.
This change ensures that in case there are no labels/annotations, we are not generating empty maps in our objects, thus preventing empty patch for metadata being generated.