removed extra comment

YuChen · YuChen · commit f1eb73330b97 · 2025-02-03T08:09:29.000-08:00
Signed-off-by: YuChen &lt;yuchen.shen@mail.utoronto.ca&gt;
diff --git a/generate-helm/ibm-common-service-operator.config b/generate-helm/ibm-common-service-operator.config
@@ -3,17 +3,11 @@ chartname: ibm-common-service-operator
 sharedValues:
   imagePullPrefix: icr.io
   imagePullSecret: ibm-entitlement-key
-  imageRegistryNamespaceOperator: cpopen
   imageRegistryNamespaceOperand: cpopen/cpfs
+  imageRegistryNamespaceOperator: cpopen
+  operatorImage: ibm-common-service-operator
   operatorNamespace: operator-ns
-  operatorImage: ibm-common-service-operator 
   tag: latest
-  affinity: {}
-  nodeSelector: {}
-  podSecurityContext: {}
-  resources: {}
-  securityContext: {}
-  tolerations: {}
 globalConfig:
   metadata.labels:
   - strategy: newline
@@ -29,8 +23,8 @@ fileConfig:
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-cr.yaml: {}
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-crb.yaml:
     subjects[0].namespace:
-      - strategy: inline
-        key: sharedValues.operatorNamespace
+    - strategy: inline
+      key: sharedValues.operatorNamespace
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-deployment.yaml:
     spec.template.spec.containers[0].image:
     - strategy: inline
@@ -41,10 +35,10 @@ fileConfig:
       key: sharedValues.operatorImage
     - strategy: inline
       key: sharedValues.tag
-  generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-rb.yaml: 
+  generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-rb.yaml:
     subjects[0].namespace:
-      - strategy: inline
-        key: sharedValues.operatorNamespace
+    - strategy: inline
+      key: sharedValues.operatorNamespace
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-role.yaml: {}
   generate-helm/ibm-common-service-operator-generated/ibm-common-service-operator-sa.yaml: {}
   generate-helm/ibm-common-service-operator-generated/mutating-webhook-configuration-mutatingwebhookconfiguration.yaml: {}
diff --git a/helm-cluster-scoped/templates/cluster-rbac.yaml b/helm-cluster-scoped/templates/cluster-rbac.yaml
@@ -1,4 +1,3 @@
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata: 
@@ -15,7 +14,6 @@ subjects:
     namespace: {{ .Values.operatorNamespace }}
 
 ---
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata: 
@@ -96,7 +94,6 @@ rules:
       - watch
 
 ---
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: v1
 kind: ServiceAccount
 metadata: 
diff --git a/helm-cluster-scoped/values.yaml b/helm-cluster-scoped/values.yaml
@@ -1,17 +1,10 @@
-# 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: {}
 ibmCommonServiceOperatorCr: {}
diff --git a/helm/templates/operator-deployment.yaml b/helm/templates/operator-deployment.yaml
@@ -1,4 +1,3 @@
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: apps/v1
 kind: Deployment
 metadata: 
diff --git a/helm/templates/rbac.yaml b/helm/templates/rbac.yaml
@@ -1,4 +1,3 @@
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata: 
@@ -16,7 +15,6 @@ subjects:
     namespace: {{ .Values.operatorNamespace }}
 
 ---
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata: 
@@ -208,7 +206,6 @@ rules:
       - watch
 
 ---
-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)
 apiVersion: v1
 kind: ServiceAccount
 metadata: 
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,17 +1,10 @@
-# 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: {}
 ibmCommonServiceOperatorCr: {}
diff --git a/scripts/restructure_helm.sh b/scripts/restructure_helm.sh
@@ -50,6 +50,8 @@ merge_yaml() {
         echo -e "\n---" >> $output_file
         cat $HELM_SRC_DIR/templates/ibm-common-service-operator-sa.yaml >> $output_file
     fi
+
+    sed -i '/^# Generated by \[Kustohelmize\]/d' $output_file
 }
 
 # ----------------- Namespace-scoped resources -----------------
@@ -68,6 +70,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 '/^# 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
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/templates/_helpers.tpl "$dir/templates/"; done
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# Generated by [Kustohelmize](https://github.com/yeahdongcn/kustohelmize)`
`2`	`1`	`apiVersion: apps/v1`
`3`	`2`	`kind: Deployment`
`4`	`3`	`metadata:`