diff --git a/nxrm-ha/templates/image-pull-secret.yaml b/nxrm-ha/templates/image-pull-secret.yaml index ca2d712..9873d11 100644 --- a/nxrm-ha/templates/image-pull-secret.yaml +++ b/nxrm-ha/templates/image-pull-secret.yaml @@ -1,4 +1,4 @@ -{{- if .Values.statefulset.imagePullSecrets }} +{{- if and (.Values.statefulset.imagePullSecrets) (not (kindIs "slice" .Values.statefulset.imagePullSecretst)) }} apiVersion: v1 kind: Secret metadata: @@ -12,7 +12,7 @@ metadata: {{- end }} {{- end }} data: - .dockerconfigjson: {{ .Values.statefulset.imagePullSecrets.secret }} + .dockerconfigjson: {{ required "A valid .Values.statefulset.imagePullSecrets.secret is required!" .Values.statefulset.imagePullSecrets.secret }} type: kubernetes.io/dockerconfigjson {{- end }} diff --git a/nxrm-ha/templates/statefulset.yaml b/nxrm-ha/templates/statefulset.yaml index cb56f6d..b752ad6 100644 --- a/nxrm-ha/templates/statefulset.yaml +++ b/nxrm-ha/templates/statefulset.yaml @@ -63,9 +63,16 @@ spec: {{ toYaml .Values.statefulset.hostAliases | nindent 8 }} {{- end }} {{- if .Values.statefulset.imagePullSecrets }} + {{- if (kindIs "slice" .Values.statefulset.imagePullSecrets) }} + {{- with .Values.statefulset.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + {{ else }} imagePullSecrets: - name: {{ template "nexus.name" . }}-imagepullsecret {{- end }} + {{- end }} containers: - name: nxrm-app image: {{ .Values.statefulset.container.image.repository }}:{{ .Values.statefulset.container.image.tag }}