Remove sourceName and sourceNamespace fields from OperandRegistry (#2592)

* Remove sourceName and sourceNamespace fields from OperandRegistry

Signed-off-by: Daniel Fan <[email protected]>

* Add RemoveCondition method and update warning conditions for CatalogSource configuration

Signed-off-by: Daniel Fan <[email protected]>

* Remove unnecessary conditions in SetReadyCondition method

Signed-off-by: Daniel Fan <[email protected]>

---------

Signed-off-by: Daniel Fan <[email protected]>

Author: Daniel-Fan

api/v3/commonservice_types.go

@@ -303,11 +303,12 @@ const (
 )
 
 const (
-	ConditionMessageReconcile = "reconciling CommonService CR."
-	ConditionMessageInit      = "initializing/updating: waiting for OperandRegistry and OperandConfig to become ready."
-	ConditionMessageConfig    = "configuring CommonService CR."
-	ConditionMessageMissSC    = "warning: StorageClass is not configured in CommonService CR, if KeyCloak or IBM IM service will be deployed, please configure StorageClass in the CS CR. Refer to the documentation for more information: https://www.ibm.com/docs/en/cloud-paks/foundational-services/4.6?topic=options-configuring-foundational-services#storage-class"
-	ConditionMessageReady     = "CommonService CR is ready."
+	ConditionMessageReconcile           = "reconciling CommonService CR."
+	ConditionMessageInit                = "initializing/updating: waiting for OperandRegistry and OperandConfig to become ready."
+	ConditionMessageConfig              = "configuring CommonService CR."
+	ConditionMessageMissSC              = "warning: StorageClass is not configured in CommonService CR, if KeyCloak or IBM IM service will be deployed, please configure StorageClass in the CS CR. Refer to the documentation for more information: https://www.ibm.com/docs/en/cloud-paks/foundational-services/4.6?topic=options-configuring-foundational-services#storage-class"
+	ConditionMessageReady               = "CommonService CR is ready."
+	ConditionMessageCatalogNotSupported = "warning: CatalogSource configuration is not supported. Please remove .spec.CatalogName and .spec.CatalogNamespace from the CommonService CR."
 )
 
 // +kubebuilder:object:root=true
@@ -356,7 +357,6 @@ func (r *CommonService) UpdateConfigStatus(CSData *CSData, operatorDeployed, ser
 	}
 
 	r.Status.ConfigStatus.CatalogName = r.Spec.CatalogName
-
 	r.Status.ConfigStatus.CatalogNamespace = r.Spec.CatalogNamespace
 
 	r.Status.ConfigStatus.OperatorDeployed = true
@@ -386,7 +386,10 @@ func (r *CommonService) SetPendingCondition(name string, ct ConditionType, cs co
 
 // SetReadyCondition creates a Condition to claim Ready.
 func (r *CommonService) SetReadyCondition(name string, ct ConditionType, cs corev1.ConditionStatus) {
-	r.UpdateConditionList(corev1.ConditionFalse)
+	r.RemoveCondition(ConditionTypePending)
+	r.RemoveCondition(ConditionTypeReconciling)
+	r.RemoveCondition(ConditionTypeBlocked)
+	r.RemoveCondition(ConditionTypeError)
 	c := newCondition(ConditionTypeReady, cs, ConditionReasonReady, ConditionMessageReady)
 	r.setCondition(*c)
 }
@@ -414,6 +417,31 @@ func (r *CommonService) UpdateConditionList(ct corev1.ConditionStatus) {
 	}
 }
 
+// RemoveCondition removes a condition or multiple condition from the CommonService CR
+func (r *CommonService) RemoveCondition(condType ConditionType, msg ...string) {
+	if len(msg) == 0 {
+		// If no messages provided, remove all conditions of the specified type
+		newConditions := []CommonServiceCondition{}
+		for _, cond := range r.Status.Conditions {
+			if cond.Type != condType {
+				newConditions = append(newConditions, cond)
+			}
+		}
+		r.Status.Conditions = newConditions
+	} else {
+		// If messages provided, remove conditions that match the type and one of the messages
+		for _, message := range msg {
+			newConditions := []CommonServiceCondition{}
+			for _, cond := range r.Status.Conditions {
+				if cond.Type != condType || cond.Message != message {
+					newConditions = append(newConditions, cond)
+				}
+			}
+			r.Status.Conditions = newConditions
+		}
+	}
+}
+
 // NewCondition Returns a new condition with the given values for CommonService
 func newCondition(condType ConditionType, status corev1.ConditionStatus, reason, message string) *CommonServiceCondition {
 	now := time.Now().Format(time.RFC3339)

internal/controller/bootstrap/init.go

@@ -316,6 +316,16 @@ func (b *Bootstrap) CheckWarningCondition(instance *apiv3.CommonService) error {
 	// check if there is no storageClass declared under spec section and the default count is not 1
 	if instance.Spec.StorageClass == "" && defaultCount != 1 {
 		instance.SetWarningCondition(constant.MasterCR, apiv3.ConditionTypeWarning, corev1.ConditionTrue, apiv3.ConditionReasonWarning, apiv3.ConditionMessageMissSC)
+	} else {
+		// remove the warning condition if storageClass is configured
+		instance.RemoveCondition(apiv3.ConditionTypeWarning, apiv3.ConditionMessageMissSC)
+	}
+
+	if instance.Spec.CatalogName != "" || instance.Spec.CatalogNamespace != "" {
+		instance.SetWarningCondition(constant.MasterCR, apiv3.ConditionTypeWarning, corev1.ConditionTrue, apiv3.ConditionReasonWarning, apiv3.ConditionMessageCatalogNotSupported)
+	} else {
+		// remove the warning condition if catalogSource is not configured
+		instance.RemoveCondition(apiv3.ConditionTypeWarning, apiv3.ConditionMessageCatalogNotSupported)
 	}
 	return nil
 }