operator: drop last-applied-configuration annotation when using SSA (istio#44896)

howardjohn · web-flow · commit e4496187adc3 · 2023-05-13T06:37:47.000-07:00
Pretty sure we don't need this when using SSA, its design only for
non-SSA.
diff --git a/operator/pkg/helmreconciler/apply.go b/operator/pkg/helmreconciler/apply.go
@@ -162,8 +162,10 @@ func (h *HelmReconciler) ApplyObject(obj *unstructured.Unstructured, serverSideA
 		return errs.ToError()
 	}
 
-	if err := kubectlutil.CreateApplyAnnotation(obj, unstructured.UnstructuredJSONScheme); err != nil {
-		scope.Errorf("unexpected error adding apply annotation to object: %s", err)
+	if !serverSideApply {
+		if err := kubectlutil.CreateApplyAnnotation(obj, unstructured.UnstructuredJSONScheme); err != nil {
+			scope.Errorf("unexpected error adding apply annotation to object: %s", err)
+		}
 	}
 
 	objectKey := client.ObjectKeyFromObject(obj)

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,10 @@ func (h HelmReconciler) ApplyObject(obj unstructured.Unstructured, serverSideA`
`162`	`162`	`return errs.ToError()`
`163`	`163`	`}`
`164`	`164`
`165`		`- if err := kubectlutil.CreateApplyAnnotation(obj, unstructured.UnstructuredJSONScheme); err != nil {`
`166`		`- scope.Errorf("unexpected error adding apply annotation to object: %s", err)`
	`165`	`+ if !serverSideApply {`
	`166`	`+ if err := kubectlutil.CreateApplyAnnotation(obj, unstructured.UnstructuredJSONScheme); err != nil {`
	`167`	`+ scope.Errorf("unexpected error adding apply annotation to object: %s", err)`
	`168`	`+ }`
`167`	`169`	`}`
`168`	`170`
`169`	`171`	`objectKey := client.ObjectKeyFromObject(obj)`