updated chart to use globals for CPD spec (#355)

Signed-off-by: Henry Li <[email protected]>

Author: bitscuit

helm-cluster-scoped/templates/01-cluster-rbac.yaml

@@ -31,7 +31,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: ibm-namespace-scope-operator
-    namespace: {{ .Values.operatorNamespace }}
+    namespace: {{ .Values.global.operatorNamespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

helm-cluster-scoped/values.yaml

@@ -1,6 +1,6 @@
-imagePullPrefix: icr.io
-imagePullSecret: ibm-entitlement-key
+# imagePullPrefix: icr.io
+# imagePullSecret: ibm-entitlement-key
 imageRegistryNamespaceOperator: cpopen
 imageRegistryNamespaceOperand: cpopen/cpfs
 
-operatorNamespace: "helm-operators"
+# operatorNamespace: ""

helm/templates/00-rbac.yaml

@@ -2,7 +2,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ibm-namespace-scope-operator
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 rules:
   - verbs:
       - create
@@ -80,11 +80,11 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ibm-namespace-scope-operator
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 subjects:
   - kind: ServiceAccount
     name: ibm-namespace-scope-operator
-    namespace: {{ .Values.operatorNamespace }}
+    namespace: {{ .Values.global.operatorNamespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -98,4 +98,4 @@ metadata:
     app.kubernetes.io/managed-by: ibm-namespace-scope-operator
     app.kubernetes.io/name: ibm-namespace-scope-operator
   name: ibm-namespace-scope-operator
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}

helm/templates/01-operator-deployment.yaml

@@ -2,7 +2,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: ibm-namespace-scope-operator
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
   labels:
     app.kubernetes.io/instance: ibm-namespace-scope-operator
     app.kubernetes.io/managed-by: ibm-namespace-scope-operator
@@ -50,7 +50,7 @@ spec:
           ]
         capabilities: Seamless Upgrades
         productName: IBM Cloud Platform Common Services
-        containerImage: '{{ .Values.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12'
+        containerImage: '{{ .Values.global.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12'
         productMetric: FREE
     spec:
       restartPolicy: Always
@@ -70,7 +70,7 @@ spec:
       terminationGracePeriodSeconds: 10
       securityContext: {}
       imagePullSecrets:
-      - name: {{ .Values.imagePullSecret }}
+      - name: {{ .Values.global.imagePullSecret }}
       containers:
         - resources:
             limits:
@@ -104,7 +104,7 @@ spec:
               type: RuntimeDefault
           imagePullPolicy: IfNotPresent
           terminationMessagePolicy: File
-          image: '{{ .Values.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12'
+          image: '{{ .Values.global.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12'
       serviceAccount: ibm-namespace-scope-operator
       dnsPolicy: ClusterFirst
   strategy:

helm/templates/02-nss-cr.yaml

@@ -4,15 +4,15 @@ metadata:
   labels:
     foundationservices.cloudpak.ibm.com: nss
   name: common-service
-  namespace: {{ .Values.operatorNamespace }}
+  namespace: {{ .Values.global.operatorNamespace }}
 spec:
   csvInjector:
     enable: true
   license:
-    accept: true
+    accept: {{ .Values.global.licenseAccept }}
   namespaceMembers:
-    - {{ .Values.operatorNamespace }}
-    - {{ .Values.servicesNamespace }}
+    - {{ .Values.global.operatorNamespace }}
+    - {{ .Values.global.instanceNamespace }}
     {{- range $i, $v := $.Values.tenantNamespaces }}
     - {{ $v }}
     {{- end }}

helm/values.yaml

@@ -1,14 +1,12 @@
-imagePullPrefix: icr.io
-imagePullSecret: ibm-entitlement-key
+# imagePullPrefix: icr.io
+# imagePullSecret: ibm-entitlement-key
 #include all namespaces in the tenant in this list object including the operator and services namespace
 tenantNamespaces: 
-  - <tenant namespace 1>
-  - <tenant namespace 2>
+  - ""
+  - ""
   #etc
 imageRegistryNamespaceOperator: cpopen
 imageRegistryNamespaceOperand: cpopen/cpfs
 
-operatorImage: ibm-namespace-scope-operator
-
-operatorNamespace: "helm-operators"
-servicesNamespace: "helm-services"
+# operatorNamespace: ""
+# servicesNamespace: ""