Prevent unnecessary update of observatorium in MCO (stolostron#1473)

* logs Signed-off-by: Coleen Iona Quadros <[email protected]> * prevent unnecessary update of observatorium Signed-off-by: Coleen Iona Quadros <[email protected]> * prevent unnecessary update of observatorium Signed-off-by: Coleen Iona Quadros <[email protected]> * remove logs Signed-off-by: Coleen Iona Quadros <[email protected]> * remove logs Signed-off-by: Coleen Iona Quadros <[email protected]> --------- Signed-off-by: Coleen Iona Quadros <[email protected]>
coleenquadros · Jun 10, 2024 · bcbdee1 · bcbdee1
1 parent b489cd8
commit bcbdee1
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/operators/multiclusterobservability/controllers/multiclusterobservability/observatorium.go b/operators/multiclusterobservability/controllers/multiclusterobservability/observatorium.go
@@ -161,20 +161,22 @@ func GenerateObservatoriumCR(
 
 	oldSpec := observatoriumCRFound.Spec
 	newSpec := observatoriumCR.Spec
-	oldSpecBytes, _ := yaml.Marshal(oldSpec)
-	newSpecBytes, _ := yaml.Marshal(newSpec)
-	if bytes.Equal(newSpecBytes, oldSpecBytes) &&
-		labels[obsCRConfigHashLabelName] == observatoriumCRFound.Labels[obsCRConfigHashLabelName] {
-		return nil, nil
-	}
 
-	// keep the tenant id unchanged
+	// keep the tenant id unchanged and ensure the new spec has the same tenant ID as the old spec to prevent Observatorium
+	// from updating
 	for i, newTenant := range newSpec.API.Tenants {
 		for _, oldTenant := range oldSpec.API.Tenants {
 			updateTenantID(&newSpec, newTenant, oldTenant, i)
 		}
 	}
 
+	oldSpecBytes, _ := yaml.Marshal(oldSpec)
+	newSpecBytes, _ := yaml.Marshal(newSpec)
+	if bytes.Equal(newSpecBytes, oldSpecBytes) &&
+		labels[obsCRConfigHashLabelName] == observatoriumCRFound.Labels[obsCRConfigHashLabelName] {
+		return nil, nil
+	}
+
 	log.Info("Updating observatorium CR",
 		"observatorium", observatoriumCR.Name,
 	)