updated chart to use global values to meet CPD spec

helm-cluster-scoped/values.yaml

@@ -1,11 +1,11 @@
-imagePullPrefix: icr.io
-imagePullSecret: ibm-entitlement-key
+# imagePullPrefix: icr.io
+# imagePullSecret: ibm-entitlement-key
 
 # Note there are no leading or trailing /'s
 imageRegistryNamespaceOperator: cpopen
 imageRegistryNamespaceOperand: cpopen/cpfs
 
 # other configuration you think you might need for your operator
 # following are examples, not required:
-operatorNamespace: ""
-servicesNamespace: ""
+# operatorNamespace: ""
+# servicesNamespace: ""

helm/templates/operator-deployment.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     productName: IBM_Cloud_Platform_Common_Services
   name: operand-deployment-lifecycle-manager
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
@@ -204,7 +204,7 @@ spec:
           value: operand-deployment-lifecycle-manager.v4.4.0
         - name: NO_OLM
           value: "true"
-        image: {{ .Values.imagePullPrefix}}/{{ .Values.imageRegistryNamespaceOperator}}/odlm:4.4.0
+        image: {{ .Values.global.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/odlm:4.4.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -248,7 +248,7 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
       imagePullSecrets:
-        - name: {{ .Values.imagePullSecret }}
+        - name: {{ .Values.global.imagePullSecret }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler

helm/templates/rbac.yaml

@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: operand-deployment-lifecycle-manager
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 rules:
 - apiGroups:
   - ""
@@ -176,22 +176,22 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: operand-deployment-lifecycle-manager
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 ---
 
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: operand-deployment-lifecycle-manager
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 
 ---
 ### role only for olm
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: operand-deployment-lifecycle-manager.v4.4.0
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 rules:
 - apiGroups:
   - operators.coreos.com
@@ -210,12 +210,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: operand-deployment-lifecycle-manager.v4.4.0
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: operand-deployment-lifecycle-manager.v4.4.0
 subjects:
 - kind: ServiceAccount
   name: operand-deployment-lifecycle-manager
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}

helm/values.yaml

@@ -1,11 +1,11 @@
-imagePullPrefix: icr.io
-imagePullSecret: ibm-entitlement-key
+# imagePullPrefix: icr.io
+# imagePullSecret: ibm-entitlement-key
 
 # Note there are no leading or trailing /'s
 imageRegistryNamespaceOperator: cpopen
 imageRegistryNamespaceOperand: cpopen/cpfs
 
 # other configuration you think you might need for your operator
 # following are examples, not required:
-operatorNamespace: ""
-servicesNamespace: ""
+# operatorNamespace: ""
+# servicesNamespace: ""