feat: add optional image pull secret configuration in templates and t…

…ests On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>
openmfp · Nov 25, 2024 · 156528e · 156528e
1 parent a0166b7
commit 156528e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 5 deletions.
diff --git a/charts/account-operator/charts/account-operator-crds-0.1.5.tgz b/charts/account-operator/charts/account-operator-crds-0.1.5.tgz
diff --git a/charts/account-operator/charts/common-0.1.5.tgz b/charts/account-operator/charts/common-0.1.5.tgz
diff --git a/charts/common/templates/_imagePullSecret.tpl b/charts/common/templates/_imagePullSecret.tpl
@@ -1,4 +1,6 @@
 {{- define "common.imagePullSecret" }}
+{{- if .Values.imagePullSecret }}
 imagePullSecrets:
   - name: {{ default .Values.imagePullSecret (.Values.global).imagePullSecret }}
+{{- end }}
 {{- end -}}
diff --git a/charts/extension-manager-operator/charts/common-0.1.5.tgz b/charts/extension-manager-operator/charts/common-0.1.5.tgz
diff --git a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz
diff --git a/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -120,8 +120,6 @@ operator match the snapshot:
           terminationGracePeriodSeconds: 10
   4: |
     apiVersion: v1
-    imagePullSecrets:
-      - name: github
     kind: ServiceAccount
     metadata:
       name: extension-manager-operator
diff --git a/charts/extension-manager-operator/tests/deployment_test.yaml b/charts/extension-manager-operator/tests/deployment_test.yaml
@@ -70,4 +70,13 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
-          value: IfNotPresent
+          value: IfNotPresent
+  - it: configure imagePullSecret
+    template: service-account.yaml
+    set:
+      imagePullSecret: my-secret
+    asserts:
+      - equal:
+          path: imagePullSecrets
+          value: 
+            - name: my-secret
diff --git a/charts/extension-manager-operator/values.yaml b/charts/extension-manager-operator/values.yaml
@@ -6,8 +6,8 @@ image:
   tag: 0.16.0
 
 # The secret used to pull the image
-## @param imagePullSecret The secret used to pull the image
-imagePullSecret: "github"
+## @param imagePullSecret The secret used to pull the image (optional)
+# imagePullSecret: "github"
 ## @param imagePullPolicy The image pull policy
 imagePullPolicy: Always
 

diff --git a/charts/portal/charts/common-0.1.5.tgz b/charts/portal/charts/common-0.1.5.tgz