fixes and enhancements to chart (#370)

* updated cluster chart to allow for multiple instances

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

* added cpfs scoped imagePullPrefix for dev testing

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

* added generic label configuration to helm templates

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

---------

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

Author: bitscuit

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

@@ -1,7 +1,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ibm-namespace-scope-operator
+  name: ibm-namespace-scope-operator-{{ .Values.global.operatorNamespace }}
   labels:
     component-id: {{ .Chart.Name }}
 rules:
@@ -29,7 +29,7 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ibm-namespace-scope-operator
+  name: ibm-namespace-scope-operator-{{ .Values.global.operatorNamespace }}
   labels:
     component-id: {{ .Chart.Name }}
 subjects:
@@ -39,4 +39,4 @@ subjects:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: ibm-namespace-scope-operator
+  name: ibm-namespace-scope-operator-{{ .Values.global.operatorNamespace }}

helm-cluster-scoped/values.yaml

@@ -4,4 +4,5 @@ cpfs:
   imageRegistryNamespaceOperator: cpopen
   imageRegistryNamespaceOperand: cpopen/cpfs
 
-# operatorNamespace: ""
+global:
+  operatorNamespace: operators

helm/templates/00-rbac.yaml

@@ -6,6 +6,7 @@
 {{- if .Values.global.instanceNamespace }}
   {{- $namespaces = append $namespaces .Values.global.instanceNamespace }}
 {{- end }}
+{{- $labels := .Values.cpfs.labels }}
 {{- range $i := $namespaces }}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
@@ -14,6 +15,9 @@ metadata:
   namespace: {{ $i }}
   labels:
     component-id: {{ $chartName }}
+    {{- with $labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
   - verbs:
       - create
@@ -94,6 +98,9 @@ metadata:
   namespace: {{ $i }}
   labels:
     component-id: {{ $chartName }}
+    {{- with $labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: ibm-namespace-scope-operator
@@ -112,5 +119,8 @@ metadata:
     app.kubernetes.io/managed-by: ibm-namespace-scope-operator
     app.kubernetes.io/name: ibm-namespace-scope-operator
     component-id: {{ .Chart.Name }}
+    {{- with .Values.cpfs.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: ibm-namespace-scope-operator
   namespace: {{ .Values.global.operatorNamespace }}

helm/templates/01-operator-deployment.yaml

@@ -9,6 +9,9 @@ metadata:
     app.kubernetes.io/name: ibm-namespace-scope-operator
     productName: IBM_Cloud_Platform_Common_Services
     component-id: {{ .Chart.Name }}
+    {{- with .Values.cpfs.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   selector:
@@ -105,7 +108,7 @@ spec:
               type: RuntimeDefault
           imagePullPolicy: IfNotPresent
           terminationMessagePolicy: File
-          image: {{ .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12
+          image: {{ .Values.cpfs.imagePullPrefix | default .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12
       serviceAccount: ibm-namespace-scope-operator
       dnsPolicy: ClusterFirst
   strategy:

helm/templates/02-nss-cr.yaml

@@ -4,6 +4,9 @@ metadata:
   labels:
     foundationservices.cloudpak.ibm.com: nss
     component-id: {{ .Chart.Name }}
+    {{- with .Values.cpfs.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: common-service
   namespace: {{ .Values.global.operatorNamespace }}
 spec:

helm/values.yaml

@@ -8,3 +8,4 @@ global:
 cpfs:
   imageRegistryNamespaceOperator: cpopen
   imageRegistryNamespaceOperand: cpopen/cpfs
+  labels: