update namespaces

Signed-off-by: Allen Li <[email protected]>
IBM · bitscuit · Jan 31, 2025 · Jan 21, 2025 · Jan 22, 2025 · Jan 22, 2025
commit 46d6f6e63f14828b9b7000019ac4e5a18e0e7228
diff --git a/helm-cluster-scoped/Chart.yaml b/helm-cluster-scoped/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: ibm-odlm
 description: A Helm chart for ibm-odlm
 type: application
-version: <CASE version>
+version: 4.3.9
 appVersion: 4.3.9
diff --git a/helm-cluster-scoped/templates/01-cluster-rbac.yaml b/helm-cluster-scoped/templates/01-cluster-rbac.yaml
@@ -1 +1,2 @@
-###
+### no cluster rbac for ODLM 
+# if it is v3 -> v4 upgrade we need to add permission to cleanup certmanager, auditlogging and licensing CR
diff --git a/helm-cluster-scoped/templates/02-cluster-webhook.yaml b/helm-cluster-scoped/templates/02-cluster-webhook.yaml
@@ -1 +1 @@
-###
+### no webhook for ODLM
diff --git a/helm-cluster-scoped/values.yaml b/helm-cluster-scoped/values.yaml
@@ -1,5 +1,10 @@
 imagePullPrefix: icr.io
+imageRegistryNamespaceOperator: cpopen
+imageRegistryNamespaceOperand: cpopen/cpfs
 imagePullSecret: ibm-entilement-key
 
 # other configuration you think you might need for your operator
 # following are examples, not required:
+operatorNamespace: ibm-common-services
+servicesNamespace: service
+operatorImage: quay.io/luzarragaben/odlm:nolm-controller3
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: ibm-odlm
 description: A Helm chart for ibm-odlm
 type: application
-version: <CASE version>
+version: 4.3.9
 appVersion: 4.3.9
diff --git a/helm/templates/00-rbac.yaml b/helm/templates/00-rbac.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: operand-deployment-lifecycle-manager
+  namespace: {{ .Values.operatorNamespace }}
 rules:
 - apiGroups:
   - ""
@@ -182,13 +183,15 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: operand-deployment-lifecycle-manager
+  namespace: {{ .Values.operatorNamespace }}
 
 ---
 ### role only for olm
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: operand-deployment-lifecycle-manager.v4.3.9
+  namespace: {{ .Values.operatorNamespace }}
 rules:
 - apiGroups:
   - operators.coreos.com
@@ -207,6 +210,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: operand-deployment-lifecycle-manager.v4.3.9
+  namespace: {{ .Values.operatorNamespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/helm/templates/01-operator-deployment.yaml b/helm/templates/01-operator-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     productName: IBM_Cloud_Platform_Common_Services
   name: operand-deployment-lifecycle-manager
+  namespace: {{ .Values.operatorNamespace }}
 spec:
   progressDeadlineSeconds: 600
   replicas: 1