correct cluster scope chart name and image pull secret

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

Author: YCShen1010

config/ibm-common-service-operator.yaml

@@ -696,7 +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
+        intent: projected
         name: ibm-common-service-operator
         productName: IBM_Cloud_Platform_Common_Services
     spec:
@@ -769,6 +769,8 @@ spec:
           runAsNonRoot: true
           seccompProfile:
             type: RuntimeDefault
+      imagePullSecrets:
+      - name: ibm-entitlement-key
       serviceAccountName: ibm-common-service-operator
       terminationGracePeriodSeconds: 10
 ---

config/manager/manager.yaml

@@ -23,7 +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
+        intent: projected
       annotations:
         productName: "IBM Cloud Platform Common Services"
         productID: "068a62892a1e4db39641342e592daa25"
@@ -99,4 +99,6 @@ spec:
           privileged: false
           readOnlyRootFilesystem: true
           runAsNonRoot: true
+      imagePullSecrets: 
+      - name: ibm-entitlement-key
       terminationGracePeriodSeconds: 10

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

@@ -6,8 +6,9 @@ sharedValues:
   imageRegistryNamespaceOperand: cpopen/cpfs
   imageRegistryNamespaceOperator: cpopen
   operatorImage: ibm-common-service-operator
-  operatorNamespace: operator-ns
-  tag: latest
+  operatorNamespace: operators
+  servicesNamespace: service
+  operatorVersion: latest
 globalConfig:
   metadata.labels:
   - strategy: newline
@@ -26,6 +27,9 @@ fileConfig:
     - strategy: inline
       key: sharedValues.operatorNamespace
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-deployment.yaml:
+    spec.template.spec.imagePullSecrets[0].name:
+    - strategy: inline
+      key: sharedValues.imagePullSecret
     spec.template.spec.containers[0].image:
     - strategy: inline
       key: sharedValues.imagePullPrefix
@@ -34,7 +38,7 @@ fileConfig:
     - strategy: inline
       key: sharedValues.operatorImage
     - strategy: inline
-      key: sharedValues.tag
+      key: sharedValues.operatorVersion
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-rb.yaml:
     subjects[0].namespace:
     - strategy: inline

helm-cluster-scoped/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: ibm-common-service-operator
+name: ibm-common-service-operator-cluster-scoped
 description: A Helm chart for the IBM Common Service Operator
 
 # A chart can be either an 'application' or a 'library' chart.

helm-cluster-scoped/values.yaml

@@ -3,8 +3,9 @@ imagePullSecret: ibm-entitlement-key
 imageRegistryNamespaceOperand: cpopen/cpfs
 imageRegistryNamespaceOperator: cpopen
 operatorImage: ibm-common-service-operator
-operatorNamespace: operator-ns
-tag: latest
+operatorNamespace: operators
+operatorVersion: latest
+servicesNamespace: service
 
 commonservicesOperatorIbmComCrd: {}
 ibmCommonServiceOperatorCr: {}

helm/templates/operator-deployment.yaml

@@ -22,7 +22,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
+        intent: projected
         name: ibm-common-service-operator
         productName: IBM_Cloud_Platform_Common_Services
     spec: 
@@ -39,7 +39,7 @@ spec:
                       - s390x
       containers:         
         - name: ibm-common-service-operator
-          image: "{{ .Values.imagePullPrefix }}/{{ .Values.imageRegistryNamespaceOperator }}/{{ .Values.operatorImage }}:{{ .Values.tag }}"
+          image: "{{ .Values.imagePullPrefix }}:{{ .Values.imageRegistryNamespaceOperator }}:{{ .Values.operatorImage }}:{{ .Values.operatorVersion }}"
           command: 
             - /manager
           env:             
@@ -95,5 +95,7 @@ spec:
             runAsNonRoot: true
             seccompProfile: 
               type: RuntimeDefault
+      imagePullSecrets:         
+        - name: {{ .Values.imagePullSecret }}
       serviceAccountName: ibm-common-service-operator
       terminationGracePeriodSeconds: 10

helm/values.yaml

@@ -3,8 +3,9 @@ imagePullSecret: ibm-entitlement-key
 imageRegistryNamespaceOperand: cpopen/cpfs
 imageRegistryNamespaceOperator: cpopen
 operatorImage: ibm-common-service-operator
-operatorNamespace: operator-ns
-tag: latest
+operatorNamespace: operators
+operatorVersion: latest
+servicesNamespace: service
 
 commonservicesOperatorIbmComCrd: {}
 ibmCommonServiceOperatorCr: {}

scripts/restructure_helm.sh

@@ -70,8 +70,11 @@ cp $HELM_SRC_DIR/crds/* $CLUSTER_SCOPED_DIR/templates/crds.yaml
 # Todo: rest of resources
 
 # Copy Helm values, Chart.yaml and helper.tpl
+# Remove generated comments
 sed -i '/^# Generated by \[Kustohelmize\]/d' $HELM_SRC_DIR/values.yaml
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/{values.yaml,Chart.yaml} "$dir/"; done
+# Rename chart name in cluster-scoped Chart.yaml 
+sed -i "s/^name: ibm-common-service-operator$/name: ibm-common-service-operator-cluster-scoped/" $CLUSTER_SCOPED_DIR/Chart.yaml
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/templates/_helpers.tpl "$dir/templates/"; done
 
 # Remove generated ibm-common-service-operator and ibm-common-service-operator-generated directories