OZG-3328 refactor imagePullSecret

src/main/helm/templates/_helpers.tpl

@@ -22,12 +22,6 @@ app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
-{{- define "app.imagePullSecret" }}
-{{- with .Values.imageCredentials }}
-{{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }}
-{{- end }}
-{{- end }}
-
 {{- define "app.nameToIdentifier" -}}
 {{- trimAll "-" ( regexReplaceAll "[^a-zA-Z0-9-]" (lower .) "" ) | trunc 20 }}
 {{- end -}}

src/main/helm/templates/deployment.yaml

@@ -145,7 +145,7 @@ spec:
       dnsConfig: {}
       dnsPolicy: ClusterFirst
       imagePullSecrets:
-        - name: {{ .Values.imagePullSecret | default "administration-image-pull-secret" }}
+        - name: {{ required "image-pull-secret must be set" .Values.imagePullSecret }}
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}

src/test/helm-linter-values.yaml

@@ -45,3 +45,4 @@ sso:
     client_roles:
       - ROLE_DUMMY
 
+imagePullSecret: image-pull-secret
\ No newline at end of file

src/test/helm/deployment_database_test.yaml

@@ -34,6 +34,7 @@ set:
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
 tests:
   - it: should have a volume for the mongodb certificate
     asserts:

src/test/helm/deployment_defaults_labels_test.yaml

@@ -34,7 +34,7 @@ set:
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
-
+  imagePullSecret: image-pull-secret
 tests:
   - it: check metadata.labels
     asserts:

src/test/helm/deployment_defaults_sso_test.yaml

@@ -36,6 +36,7 @@ set:
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
 tests:
   - it: check default values
     asserts:

src/test/helm/deployment_image_pull_secret_test.yaml

@@ -34,17 +34,15 @@ set:
   sso:
     serverUrl: https://sso.company.local
 tests:
-  - it: should use default image pull secret
-    asserts:
-      - contains:
-          path: spec.template.spec.imagePullSecrets
-          content:
-            name: administration-image-pull-secret
-  - it: should use customizable image pull secret
+  - it: should set image pull secret
     set:
-      imagePullSecret: custom-image-pull-secret
+      imagePullSecret: image-pull-secret
     asserts:
       - contains:
           path: spec.template.spec.imagePullSecrets
           content:
-            name: custom-image-pull-secret
+            name: image-pull-secret
+  - it: should fail template when image pull secret not set
+    asserts:
+      - failedTemplate:
+          errormessage: image-pull-secret must be set

src/test/helm/deployment_resources_test.yaml

@@ -33,6 +33,7 @@ set:
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
 tests:
   - it: should have customizable resources
     set:

src/test/helm/deployment_spring_profile_test.yaml

@@ -34,6 +34,7 @@ set:
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
 tests:
   - it: should override the spring profiles
     set:

src/test/helm/deployment_test.yaml

@@ -34,6 +34,7 @@ set:
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
 tests:
   - it: should have metadata values
     asserts:
@@ -96,9 +97,6 @@ tests:
       - equal:
           path: spec.template.spec.dnsPolicy
           value: "ClusterFirst"
-      - equal:
-          path: spec.template.spec.imagePullSecrets[0].name
-          value: "administration-image-pull-secret"
       - equal:
           path: spec.template.spec.restartPolicy
           value: "Always"

src/test/helm/deployment_volume_test.yaml

@@ -28,13 +28,13 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-  Release.Name: "administration"
   ozgcloud:
     environment: "default"
     bundesland: sh
     bezeichner: helm
   sso:
     serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
 tests:
   - it: should have volumeMounts on it's container
     asserts: