Set parent policy label on template when updating #35
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
willkutler
force-pushed
the
set-parent-label-on-update
branch
from
a76360a
to
af95418
Compare
mprahl
reviewed
Mar 2, 2023
mprahl
reviewed
Mar 2, 2023
willkutler
force-pushed
the
set-parent-label-on-update
branch
2 times, most recently
from
969f8e7
to
df4a698
Compare
dhaiducek
reviewed
Mar 2, 2023
willkutler
force-pushed
the
set-parent-label-on-update
branch
3 times, most recently
from
8520fd2
to
d876cae
Compare
mprahl
reviewed
Mar 9, 2023
mprahl
reviewed
Mar 9, 2023
Currently, the parent policy label on templates, which is used for open-cluster-management-io#28 , is only set on template creation, which could cause issues with policies that have already been created. This fix verifies the necessary template labels are set when updating the template. Signed-off-by: Will Kutler <wkutler@redhat.com>
willkutler
force-pushed
the
set-parent-label-on-update
branch
from
05899f7
to
2c8fb86
Compare
mprahl
reviewed
Mar 14, 2023
| @@ -666,20 +666,24 @@ func (r *PolicyReconciler) Reconcile(ctx context.Context, request reconcile.Requ | |||
| log.Error(err, "Failed to apply defaults to the ConstraintTemplate for comparison. Continuing.") | |||
| } | |||
| } | |||
| // verify parent policy label is set properly | |||
| tObjectUnstructured.SetLabels(r.setDefaultTemplateLabels(instance, tObjectUnstructured.GetLabels())) | |||
There was a problem hiding this comment.
@willkutler, did you mean this instead?
Suggested change
| tObjectUnstructured.SetLabels(r.setDefaultTemplateLabels(instance, tObjectUnstructured.GetLabels())) | |
| tObjectUnstructured.SetLabels(r.setDefaultTemplateLabels(instance, eObject.GetLabels())) |
There was a problem hiding this comment.
No, I think that line should be right - the code should retain any non-default labels specified in the template in case users edit a policy to add labels to the policy template. That line is just making sure the template labels have the default labels set too before we compare them with the existing template object's labels.
mprahl
reviewed
Mar 14, 2023
Signed-off-by: Will Kutler <wkutler@redhat.com> review Signed-off-by: Will Kutler <wkutler@redhat.com>
willkutler
force-pushed
the
set-parent-label-on-update
branch
from
2c8fb86
to
71003be
Compare
mprahl
approved these changes
Mar 14, 2023
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mprahl, willkutler 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 |
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.
Currently, the parent policy label on templates, which is used for #28 , is only set on template creation, which could cause issues with policies that have already been created. This fix verifies the necessary template labels are set when updating the template. It also includes a light refactor of the template equality check to make it look a little cleaner.