Add label to helm generated resources (#362)

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

Author: qpdpQ

helm-cluster-scoped/templates/00-crd.yaml

@@ -5,6 +5,8 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: namespacescopes.operator.ibm.com
+  labels:
+    component-id: {{ .Chart.Name }}
 spec:
   group: operator.ibm.com
   names:

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

@@ -2,6 +2,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ibm-namespace-scope-operator
+  labels:
+    component-id: {{ .Chart.Name }}
 rules:
   - verbs:
       - create
@@ -28,6 +30,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ibm-namespace-scope-operator
+  labels:
+    component-id: {{ .Chart.Name }}
 subjects:
   - kind: ServiceAccount
     name: ibm-namespace-scope-operator

helm-cluster-scoped/values.yaml

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

helm/templates/00-rbac.yaml

@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ibm-namespace-scope-operator
   namespace: {{ .Values.global.operatorNamespace }}
+  labels:
+    component-id: {{ .Chart.Name }}
 rules:
   - verbs:
       - create
@@ -81,6 +83,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ibm-namespace-scope-operator
   namespace: {{ .Values.global.operatorNamespace }}
+  labels:
+    component-id: {{ .Chart.Name }}
 subjects:
   - kind: ServiceAccount
     name: ibm-namespace-scope-operator
@@ -97,5 +101,6 @@ metadata:
     app.kubernetes.io/instance: ibm-namespace-scope-operator
     app.kubernetes.io/managed-by: ibm-namespace-scope-operator
     app.kubernetes.io/name: ibm-namespace-scope-operator
+    component-id: {{ .Chart.Name }}
   name: ibm-namespace-scope-operator
   namespace: {{ .Values.global.operatorNamespace }}

helm/templates/01-operator-deployment.yaml

@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/managed-by: ibm-namespace-scope-operator
     app.kubernetes.io/name: ibm-namespace-scope-operator
     productName: IBM_Cloud_Platform_Common_Services
+    component-id: {{ .Chart.Name }}
 spec:
   replicas: 1
   selector:
@@ -50,7 +51,7 @@ spec:
           ]
         capabilities: Seamless Upgrades
         productName: IBM Cloud Platform Common Services
-        containerImage: {{ .Values.global.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12
+        containerImage: {{ .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12
         productMetric: FREE
     spec:
       restartPolicy: Always
@@ -104,7 +105,7 @@ spec:
               type: RuntimeDefault
           imagePullPolicy: IfNotPresent
           terminationMessagePolicy: File
-          image: {{ .Values.global.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/ibm-namespace-scope-operator:4.2.12
+          image: {{ .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

@@ -3,6 +3,7 @@ kind: NamespaceScope
 metadata:
   labels:
     foundationservices.cloudpak.ibm.com: nss
+    component-id: {{ .Chart.Name }}
   name: common-service
   namespace: {{ .Values.global.operatorNamespace }}
 spec:

helm/values.yaml

@@ -5,6 +5,6 @@ global:
   imagePullSecret: ibm-entitlement-key
   licenseAccept: true
   tetheredNamespace: []
-
-imageRegistryNamespaceOperator: cpopen
-imageRegistryNamespaceOperand: cpopen/cpfs
+cpfs:
+  imageRegistryNamespaceOperator: cpopen
+  imageRegistryNamespaceOperand: cpopen/cpfs