enable image config into deployment templates

Signed-off-by: YuChen <[email protected]>

Author: YCShen1010

config/ibm-common-service-operator.yaml

@@ -696,6 +696,7 @@ spec:
         app.kubernetes.io/instance: ibm-common-service-operator
         app.kubernetes.io/managed-by: ibm-common-service-operator
         app.kubernetes.io/name: ibm-common-service-operator
+        intent: protected
         name: ibm-common-service-operator
         productName: IBM_Cloud_Platform_Common_Services
     spec:

config/manager/manager.yaml

@@ -23,6 +23,7 @@ spec:
         app.kubernetes.io/managed-by: "ibm-common-service-operator"
         app.kubernetes.io/name: "ibm-common-service-operator"
         productName: IBM_Cloud_Platform_Common_Services
+        intent: protected
       annotations:
         productName: "IBM Cloud Platform Common Services"
         productID: "068a62892a1e4db39641342e592daa25"

generate-helm/ibm-common-service-operator.config

@@ -1,7 +1,13 @@
 logger: {}
 chartname: ibm-common-service-operator
 sharedValues:
+  imagePullPrefix: icr.io
+  imagePullSecret: ibm-entitlement-key
+  imageRegistryNamespaceOperator: cpopen
+  imageRegistryNamespaceOperand: cpopen/cpfs
   operatorNamespace: operator-ns
+  operatorImage: ibm-common-service-operator 
+  tag: latest
   affinity: {}
   nodeSelector: {}
   podSecurityContext: {}
@@ -25,7 +31,16 @@ fileConfig:
     subjects[0].namespace:
       - strategy: inline
         key: sharedValues.operatorNamespace
-  generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-deployment.yaml: {}
+  generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-deployment.yaml:
+    spec.template.spec.containers[0].image:
+    - strategy: inline
+      key: sharedValues.imagePullPrefix
+    - strategy: inline
+      key: sharedValues.imageRegistryNamespaceOperator
+    - strategy: inline
+      key: sharedValues.operatorImage
+    - strategy: inline
+      key: sharedValues.tag
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-rb.yaml: 
     subjects[0].namespace:
       - strategy: inline

helm-cluster-scoped/values.yaml

@@ -1,10 +1,16 @@
 # Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 affinity: {}
+imagePullPrefix: icr.io
+imagePullSecret: ibm-entitlement-key
+imageRegistryNamespaceOperand: cpopen/cpfs
+imageRegistryNamespaceOperator: cpopen
 nodeSelector: {}
+operatorImage: ibm-common-service-operator
 operatorNamespace: operator-ns
 podSecurityContext: {}
 resources: {}
 securityContext: {}
+tag: latest
 tolerations: {}
 
 commonservicesOperatorIbmComCrd: {}

helm/templates/operator-deployment.yaml

@@ -23,6 +23,7 @@ spec:
         app.kubernetes.io/instance: ibm-common-service-operator
         app.kubernetes.io/managed-by: ibm-common-service-operator
         app.kubernetes.io/name: ibm-common-service-operator
+        intent: protected
         name: ibm-common-service-operator
         productName: IBM_Cloud_Platform_Common_Services
     spec: 
@@ -39,7 +40,7 @@ spec:
                       - s390x
       containers:         
         - name: ibm-common-service-operator
-          image: icr.io/cpopen/common-service-operator:latest
+          image: "{{ .Values.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/{{ .Values.operatorImage }}:{{ .Values.tag }}"
           command: 
             - /manager
           env:             

helm/values.yaml

@@ -1,10 +1,16 @@
 # Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 affinity: {}
+imagePullPrefix: icr.io
+imagePullSecret: ibm-entitlement-key
+imageRegistryNamespaceOperand: cpopen/cpfs
+imageRegistryNamespaceOperator: cpopen
 nodeSelector: {}
+operatorImage: ibm-common-service-operator
 operatorNamespace: operator-ns
 podSecurityContext: {}
 resources: {}
 securityContext: {}
+tag: latest
 tolerations: {}
 
 commonservicesOperatorIbmComCrd: {}

scripts/restructure_helm.sh

@@ -57,6 +57,7 @@ merge_yaml() {
 # Move and merge namespace-scoped resources
 merge_yaml "kind: Role" "$HELM_DIR/templates/rbac.yaml"
 merge_yaml "kind: Deployment" "$HELM_DIR/templates/operator-deployment.yaml"
+sed -i 's/{{ .Values.imagePullPrefix }}:{{ .Values.imageRegistryNamespaceOperator }}:{{ .Values.operatorImage }}:{{ .Values.tag }}/{{ .Values.imagePullPrefix }}\/{{ .Values.imageRegistryNamespaceOperator }}\/{{ .Values.operatorImage }}:{{ .Values.tag }}/g' $HELM_DIR/templates/operator-deployment.yaml
 
 # ----------------- Cluster-scoped resources -----------------
 
@@ -67,6 +68,7 @@ cp $HELM_SRC_DIR/crds/* $CLUSTER_SCOPED_DIR/templates/crds.yaml
 # Todo: rest of resources
 
 # Copy Helm values, Chart.yaml and helper.tpl
+#sed -i -e "s/^version:.*/version: $CHART_VERSION/" -e "s/^appVersion:.*/appVersion: $CHART_VERSION/" $HELM_DIR/Chart.yaml
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/{values.yaml,Chart.yaml} "$dir/"; done
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/templates/_helpers.tpl "$dir/templates/"; done