Add StatusMonitoredServices annotations to OperandRegistry (#2033)

Signed-off-by: Daniel Fan <[email protected]>
IBM · Jun 7, 2024 · f95ee3c · f95ee3c
1 parent 324f865
commit f95ee3c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 30 deletions.
diff --git a/api/v3/commonservice_types.go b/api/v3/commonservice_types.go
@@ -31,19 +31,21 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 type CSData struct {
-	Channel               string
-	Version               string
-	CPFSNs                string
-	ServicesNs            string
-	OperatorNs            string
-	CatalogSourceName     string
-	CatalogSourceNs       string
-	IsolatedModeEnable    string
-	ApprovalMode          string
-	OnPremMultiEnable     string
-	WatchNamespaces       string
-	CloudPakThemes        string
-	CloudPakThemesVersion string
+	Channel                 string
+	Version                 string
+	CPFSNs                  string
+	ServicesNs              string
+	OperatorNs              string
+	CatalogSourceName       string
+	CatalogSourceNs         string
+	IsolatedModeEnable      string
+	ApprovalMode            string
+	OnPremMultiEnable       string
+	WatchNamespaces         string
+	CloudPakThemes          string
+	CloudPakThemesVersion   string
+	ExcludedCatalog         string
+	StatusMonitoredServices string
 }
 
 // +kubebuilder:pruning:PreserveUnknownFields

diff --git a/controllers/bootstrap/init.go b/controllers/bootstrap/init.go
@@ -111,14 +111,16 @@ func NewBootstrap(mgr manager.Manager) (bs *Bootstrap, err error) {
 		return
 	}
 	csData := apiv3.CSData{
-		CPFSNs:            cpfsNs,
-		ServicesNs:        servicesNs,
-		OperatorNs:        operatorNs,
-		CatalogSourceName: catalogSourceName,
-		CatalogSourceNs:   catalogSourceNs,
-		ApprovalMode:      approvalMode,
-		WatchNamespaces:   util.GetWatchNamespace(),
-		OnPremMultiEnable: strconv.FormatBool(util.CheckMultiInstances(mgr.GetAPIReader())),
+		CPFSNs:                  cpfsNs,
+		ServicesNs:              servicesNs,
+		OperatorNs:              operatorNs,
+		CatalogSourceName:       catalogSourceName,
+		CatalogSourceNs:         catalogSourceNs,
+		ApprovalMode:            approvalMode,
+		WatchNamespaces:         util.GetWatchNamespace(),
+		OnPremMultiEnable:       strconv.FormatBool(util.CheckMultiInstances(mgr.GetAPIReader())),
+		ExcludedCatalog:         constant.ExcludedCatalog,
+		StatusMonitoredServices: constant.StatusMonitoredServices,
 	}
 
 	bs = &Bootstrap{

diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go
@@ -33,6 +33,11 @@ var (
 	CSV4SaasOperandConfig   string
 )
 
+const (
+	ExcludedCatalog         = "certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog"
+	StatusMonitoredServices = "ibm-idp-config-ui-operator,ibm-mongodb-operator,ibm-im-operator"
+)
+
 const (
 	MongoDBOpReg = `
 apiVersion: operator.ibm.com/v1alpha1
@@ -44,7 +49,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-im-mongodb-operator-v4.0
@@ -74,7 +80,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-im-operator-v4.0
@@ -131,7 +138,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-idp-config-ui-operator-v4.0
@@ -182,7 +190,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-platformui-operator-v4.0
@@ -235,7 +244,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - channel: stable-v22
@@ -265,7 +275,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - channel: stable
@@ -1314,7 +1325,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: "{{ .Version }}"
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-licensing-operator
@@ -1419,7 +1431,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-im-operator
@@ -1509,7 +1522,8 @@ metadata:
     operator.ibm.com/managedByCsOperator: "true"
   annotations:
     version: {{ .Version }}
-    excluded-catalogsource: certified-operators,community-operators,redhat-marketplace,ibm-cp-automation-foundation-catalog,operatorhubio-catalog
+    excluded-catalogsource: {{ .ExcludedCatalog }}
+    status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
   - name: ibm-licensing-operator