Stop overriding default annotations when IV annotation is set

mprahl · openshift-merge-robot · commit 5d52916ecf0d · 2023-02-17T16:22:10.000+01:00
If the policy uses templates with encryption, the desired replicated policy should not get its default annotations overridden. Relates: https://issues.redhat.com/browse/ACM-1690 Signed-off-by: mprahl <mprahl@users.noreply.github.com>
diff --git a/controllers/propagator/propagation.go b/controllers/propagator/propagation.go
@@ -808,7 +808,7 @@ func (r *PolicyReconciler) handleDecision(
 	if policyHasTemplates(desiredReplicatedPolicy) {
 		// If the replicated policy has an initialization vector specified, set it for processing
 		if initializationVector, ok := replicatedPlc.Annotations[IVAnnotation]; ok {
-			tempAnnotations := replicatedPlc.GetAnnotations()
+			tempAnnotations := desiredReplicatedPolicy.GetAnnotations()
 			if tempAnnotations == nil {
 				tempAnnotations = make(map[string]string)
 			}

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ func (r *PolicyReconciler) handleDecision(`
`808`	`808`	`if policyHasTemplates(desiredReplicatedPolicy) {`
`809`	`809`	`// If the replicated policy has an initialization vector specified, set it for processing`
`810`	`810`	`if initializationVector, ok := replicatedPlc.Annotations[IVAnnotation]; ok {`
`811`		`- tempAnnotations := replicatedPlc.GetAnnotations()`
	`811`	`+ tempAnnotations := desiredReplicatedPolicy.GetAnnotations()`
`812`	`812`	`if tempAnnotations == nil {`
`813`	`813`	`tempAnnotations = make(map[string]string)`
`814`	`814`	`}`