From 7f39e9e555f2975ade7cba9a8d30b51b7853db71 Mon Sep 17 00:00:00 2001
From: YuChen <yuchen.shen@mail.utoronto.ca>
Date: Mon, 5 Aug 2024 14:59:45 -0700
Subject: [PATCH] Add user management CR

Signed-off-by: YuChen <yuchen.shen@mail.utoronto.ca>
---
 controllers/bootstrap/init.go |  2 +-
 controllers/constant/odlm.go  | 81 +++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/controllers/bootstrap/init.go b/controllers/bootstrap/init.go
index 7cd0fec35..91df8e2a2 100644
--- a/controllers/bootstrap/init.go
+++ b/controllers/bootstrap/init.go
@@ -750,11 +750,11 @@ func (b *Bootstrap) InstallOrUpdateOpcon(forceUpdateODLMCRs bool) error {
 	configs := []string{
 		constant.MongoDBOpCon,
 		constant.IMOpCon,
+		constant.UserMgmtOpCon,
 		constant.IdpConfigUIOpCon,
 		constant.PlatformUIOpCon,
 		constant.KeyCloakOpCon,
 		constant.CommonServicePGOpCon,
-		constant.UserMgmtOpCon,
 	}
 
 	baseCon = constant.CSV4OpCon
diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go
index 78f744a4b..36c0219c8 100644
--- a/controllers/constant/odlm.go
+++ b/controllers/constant/odlm.go
@@ -435,6 +435,50 @@ spec:
         operand: ibm-im-operator
 `
 
+	UserMgmtOpCon = `
+apiVersion: operator.ibm.com/v1alpha1
+kind: OperandConfig
+metadata:
+  name: common-service
+  namespace: "{{ .ServicesNs }}"
+  labels:
+    operator.ibm.com/managedByCsOperator: "true"
+  annotations:
+    version: {{ .Version }}
+spec:
+  services:
+  - name: ibm-user-management-operator
+    resources:
+      - apiVersion: operator.ibm.com/v1alpha1
+        labels:
+          app.kubernetes.io/created-by: ibm-user-management-operator
+          app.kubernetes.io/instance: accountiam-sample
+          app.kubernetes.io/managed-by: kustomize
+          app.kubernetes.io/name: accountiam
+          app.kubernetes.io/part-of: ibm-user-management-operator
+        kind: AccountIAM
+        name: accountiam-sample
+      - apiVersion: operator.ibm.com/v1alpha1
+        data:
+          spec:
+            bindings:
+              public-account-iam-config-dev:
+                configmap: account-iam-env-configmap-dev
+              public-bootstrap-creds:
+                secret: user-mgmt-bootstrap
+              public-ibmcloudca-secret:
+                secret: ibmcloud-cluster-ca-secret
+              public-mcsp-integration-details:
+                secret: mcsp-im-integration-details
+            description: Binding information that should be accessible to User Management adopters
+            operand: ibm-user-management-operator
+            registry: common-service
+            registryNamespace: {{ .ServicesNs }}
+        force: true
+        kind: OperandBindInfo
+        name: ibm-user-mgmt-bindinfo
+`
+
 	IdpConfigUIOpCon = `
 apiVersion: operator.ibm.com/v1alpha1
 kind: OperandConfig
@@ -1064,43 +1108,6 @@ spec:
 `
 )
 
-const (
-	UserMgmtOpCon = `
-apiVersion: operator.ibm.com/v1alpha1
-kind: OperandConfig
-metadata:
-  name: common-service
-  namespace: "{{ .ServicesNs }}"
-  labels:
-    operator.ibm.com/managedByCsOperator: "true"
-  annotations:
-    version: {{ .Version }}
-spec:
-  services:
-  - name: ibm-user-management-operator
-    resources:
-      - apiVersion: operator.ibm.com/v1alpha1
-        data:
-          spec:
-            bindings:
-              public-account-iam-config-dev:
-                configmap: account-iam-env-configmap-dev
-              public-bootstrap-creds:
-                secret: user-mgmt-bootstrap
-              public-ibmcloudca-secret:
-                secret: ibmcloud-cluster-ca-secret
-              public-mcsp-integration-details:
-                secret: mcsp-im-integration-details
-            description: Binding information that should be accessible to User Management adopters
-            operand: ibm-user-management-operator
-            registry: common-service
-            registryNamespace: {{ .ServicesNs }}
-        force: true
-        kind: OperandBindInfo
-        name: ibm-user-mgmt-bindinfo
-  `
-)
-
 const (
 	CommonServicePGOpCon = `
 apiVersion: operator.ibm.com/v1alpha1