fix: when app ns and monitoring ns are the same, createorupdate wont …

…work (#1537)

Signed-off-by: Wen Zhou <[email protected]>

controllers/dscinitialization/utils.go

@@ -54,7 +54,7 @@ func (r *DSCInitializationReconciler) createOperatorResource(ctx context.Context
 	// Patch monitoring namespace
 	err := r.patchMonitoringNS(ctx, dscInit)
 	if err != nil {
-		log.Error(err, "error patch monitoring namespace for managed cluster")
+		log.Error(err, "error patch monitoring namespace")
 		return err
 	}
 
@@ -143,11 +143,11 @@ func (r *DSCInitializationReconciler) createAppNamespace(ctx context.Context, ns
 
 func (r *DSCInitializationReconciler) patchMonitoringNS(ctx context.Context, dscInit *dsciv1.DSCInitialization) error {
 	log := logf.FromContext(ctx)
-	if dscInit.Spec.Monitoring.ManagementState != operatorv1.Managed {
+	monitoringName := dscInit.Spec.Monitoring.Namespace
+	if dscInit.Spec.Monitoring.ManagementState != operatorv1.Managed || dscInit.Spec.ApplicationsNamespace == monitoringName {
 		return nil
 	}
 	// Create Monitoring Namespace if it is enabled and not exists
-	monitoringName := dscInit.Spec.Monitoring.Namespace
 
 	desiredMonitoringNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{