accept only object based imagepullsecrets

Author: doxthree

README.md

@@ -44,7 +44,9 @@ You need to substitute the username and password with the credentials we provide
 ```yaml
 global:
   imagePullSecrets:
-    - my-image-pull-secret
+    - name: my-image-pull-secret
+    - name: my-other-image-pull-secret
+    ...
 ```
 
 

charts/vaas/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vaas
-version: 3.0.3
+version: 3.1.0
 description: Deployment of a Verdict-as-a-Service on-premise instance
 maintainers:
   - name: G DATA CyberDefense AG

charts/vaas/templates/gateway/_helpers.tpl

@@ -33,19 +33,14 @@ If release name contains chart name it will be used as a full name.
 {{- if or $hasIps $hasLocal $hasGlobalImagePullSecret $hasGlobalDockerconfig }}
 imagePullSecrets:
   {{- range $i, $entry := $ips }}
-    {{- if kindIs "string" $entry }}
-  - name: {{ $entry }}
-    {{- else if kindIs "map" $entry }}
-      {{- if hasKey $entry "name" }}
-  - name: {{ get $entry "name" }}
-      {{- else if hasKey $entry "secretName" }}
-  - name: {{ get $entry "secretName" }}
-      {{- else }}
-      {{- fail (printf "global.imagePullSecrets[%d] must have key 'name' (or 'secretName'). Got keys: %v" $i (keys $entry)) }}
-      {{- end }}
-    {{- else }}
-    {{- fail (printf "global.imagePullSecrets[%d] has unsupported kind %s (type %s)" $i (kindOf $entry) (typeOf $entry)) }}
+    {{- if not (kindIs "map" $entry) -}}
+      {{- fail (printf "global.imagePullSecrets[%d] must be an object with 'name' (or 'secretName'), not %s" $i (kindOf $entry)) -}}
+    {{- end -}}
+    {{- $name := (get $entry "name") | default (get $entry "secretName") -}}
+    {{- if not $name -}}
+      {{- fail (printf "global.imagePullSecrets[%d] must contain key 'name' or 'secretName'. Got keys: %v" $i (keys $entry)) -}}
     {{- end }}
+  - name: {{ $name }}
   {{- end }}
 
   {{- if $hasLocal }}
@@ -58,12 +53,10 @@ imagePullSecrets:
   - name: {{ include "gateway.fullname" . }}-global-dockerconfigjson
   {{- end }}
 {{- else -}}
-{{- fail "You have to set at least one imagePullSecret (global.imagePullSecrets, imagePullSecret, global.secret.imagePullSecret or global.secret.dockerconfigjson)" }}
+{{- fail "You have to set at least one imagePullSecret: use global.imagePullSecrets (objects with 'name'/'secretName') or set imagePullSecret/global.secret.*" }}
 {{- end -}}
 {{- end -}}
 
-
-
 {{/*
 Create chart name and version as used by the chart label.
 */}}