fixup! Use SSA instead of Update for finalizer operations

tmshort · tmshort · commit 1e353c7463b1 · 2025-11-14T17:03:48.000-05:00
Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/internal/catalogd/controllers/core/clustercatalog_controller.go b/internal/catalogd/controllers/core/clustercatalog_controller.go
@@ -408,10 +408,10 @@ func (r *ClusterCatalogReconciler) needsPoll(lastSuccessfulPoll time.Time, catal
 
 // Compare resources - Annotations/Labels/Spec
 func checkForUnexpectedFieldChange(a, b *ocv1.ClusterCatalog) bool {
-	if !equality.Semantic.DeepEqual(a.ObjectMeta.Annotations, b.ObjectMeta.Annotations) {
+	if !equality.Semantic.DeepEqual(a.Annotations, b.Annotations) {
 		return true
 	}
-	if !equality.Semantic.DeepEqual(a.ObjectMeta.Labels, b.ObjectMeta.Labels) {
+	if !equality.Semantic.DeepEqual(a.Labels, b.Labels) {
 		return true
 	}
 	return !equality.Semantic.DeepEqual(a.Spec, b.Spec)
diff --git a/internal/operator-controller/controllers/clusterextension_controller.go b/internal/operator-controller/controllers/clusterextension_controller.go
@@ -151,10 +151,10 @@ func ensureAllConditionsWithReason(ext *ocv1.ClusterExtension, reason v1alpha1.C
 
 // Compare resources - Annotations/Labels/Spec
 func checkForUnexpectedClusterExtensionFieldChange(a, b *ocv1.ClusterExtension) bool {
-	if !equality.Semantic.DeepEqual(a.ObjectMeta.Annotations, b.ObjectMeta.Annotations) {
+	if !equality.Semantic.DeepEqual(a.Annotations, b.Annotations) {
 		return true
 	}
-	if !equality.Semantic.DeepEqual(a.ObjectMeta.Labels, b.ObjectMeta.Labels) {
+	if !equality.Semantic.DeepEqual(a.Labels, b.Labels) {
 		return true
 	}
 	return !equality.Semantic.DeepEqual(a.Spec, b.Spec)
diff --git a/internal/operator-controller/controllers/clusterextensionrevision_controller.go b/internal/operator-controller/controllers/clusterextensionrevision_controller.go
@@ -103,10 +103,10 @@ func (c *ClusterExtensionRevisionReconciler) Reconcile(ctx context.Context, req
 
 // Compare resources - Annotations/Labels/Spec
 func checkForUnexpectedClusterExtensionRevisionFieldChange(a, b *ocv1.ClusterExtensionRevision) bool {
-	if !equality.Semantic.DeepEqual(a.ObjectMeta.Annotations, b.ObjectMeta.Annotations) {
+	if !equality.Semantic.DeepEqual(a.Annotations, b.Annotations) {
 		return true
 	}
-	if !equality.Semantic.DeepEqual(a.ObjectMeta.Labels, b.ObjectMeta.Labels) {
+	if !equality.Semantic.DeepEqual(a.Labels, b.Labels) {
 		return true
 	}
 	return !equality.Semantic.DeepEqual(a.Spec, b.Spec)

Original file line number	Diff line number	Diff line change
`@@ -408,10 +408,10 @@ func (r *ClusterCatalogReconciler) needsPoll(lastSuccessfulPoll time.Time, catal`
`408`	`408`
`409`	`409`	`// Compare resources - Annotations/Labels/Spec`
`410`	`410`	`func checkForUnexpectedFieldChange(a, b *ocv1.ClusterCatalog) bool {`
`411`		`- if !equality.Semantic.DeepEqual(a.ObjectMeta.Annotations, b.ObjectMeta.Annotations) {`
	`411`	`+ if !equality.Semantic.DeepEqual(a.Annotations, b.Annotations) {`
`412`	`412`	`return true`
`413`	`413`	`}`
`414`		`- if !equality.Semantic.DeepEqual(a.ObjectMeta.Labels, b.ObjectMeta.Labels) {`
	`414`	`+ if !equality.Semantic.DeepEqual(a.Labels, b.Labels) {`
`415`	`415`	`return true`
`416`	`416`	`}`
`417`	`417`	`return !equality.Semantic.DeepEqual(a.Spec, b.Spec)`
Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,10 @@ func ensureAllConditionsWithReason(ext *ocv1.ClusterExtension, reason v1alpha1.C`
`151`	`151`
`152`	`152`	`// Compare resources - Annotations/Labels/Spec`
`153`	`153`	`func checkForUnexpectedClusterExtensionFieldChange(a, b *ocv1.ClusterExtension) bool {`
`154`		`- if !equality.Semantic.DeepEqual(a.ObjectMeta.Annotations, b.ObjectMeta.Annotations) {`
	`154`	`+ if !equality.Semantic.DeepEqual(a.Annotations, b.Annotations) {`
`155`	`155`	`return true`
`156`	`156`	`}`
`157`		`- if !equality.Semantic.DeepEqual(a.ObjectMeta.Labels, b.ObjectMeta.Labels) {`
	`157`	`+ if !equality.Semantic.DeepEqual(a.Labels, b.Labels) {`
`158`	`158`	`return true`
`159`	`159`	`}`
`160`	`160`	`return !equality.Semantic.DeepEqual(a.Spec, b.Spec)`
Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,10 @@ func (c *ClusterExtensionRevisionReconciler) Reconcile(ctx context.Context, req`
`103`	`103`
`104`	`104`	`// Compare resources - Annotations/Labels/Spec`
`105`	`105`	`func checkForUnexpectedClusterExtensionRevisionFieldChange(a, b *ocv1.ClusterExtensionRevision) bool {`
`106`		`- if !equality.Semantic.DeepEqual(a.ObjectMeta.Annotations, b.ObjectMeta.Annotations) {`
	`106`	`+ if !equality.Semantic.DeepEqual(a.Annotations, b.Annotations) {`
`107`	`107`	`return true`
`108`	`108`	`}`
`109`		`- if !equality.Semantic.DeepEqual(a.ObjectMeta.Labels, b.ObjectMeta.Labels) {`
	`109`	`+ if !equality.Semantic.DeepEqual(a.Labels, b.Labels) {`
`110`	`110`	`return true`
`111`	`111`	`}`
`112`	`112`	`return !equality.Semantic.DeepEqual(a.Spec, b.Spec)`