Synchronize upstreamed folder to 60263cf36

This commit is contained in:
bitnami-bot
2019-03-12 10:51:53 +00:00
parent c30dd08321
commit 4462e3d2ac
99 changed files with 864 additions and 253 deletions

View File

@@ -112,3 +112,38 @@ Also, we can't use a single if because lazy evaluation is not an option
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper Docker Image Registry Secret Names
*/}}
{{- define "parse.imagePullSecrets" -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
Also, we can not use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- range .Values.global.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- else if or .Values.server.image.pullSecrets .Values.dashboard.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.server.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- range .Values.dashboard.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end -}}
{{- else if or .Values.server.image.pullSecrets .Values.dashboard.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.server.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- range .Values.dashboard.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end -}}
{{- end -}}

View File

@@ -29,12 +29,7 @@ spec:
fsGroup: {{ .Values.dashboard.securityContext.fsGroup }}
runAsUser: {{ .Values.dashboard.securityContext.runAsUser }}
{{- end }}
{{- if .Values.dashboard.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.dashboard.image.pullSecrets }}
- name: {{ . }}
{{- end}}
{{- end }}
{{- include "parse.imagePullSecrets" . | indent 6 }}
containers:
- name: {{ template "parse.fullname" . }}
image: {{ template "parse.dashboard.image" . }}

View File

@@ -28,12 +28,7 @@ spec:
fsGroup: {{ .Values.server.securityContext.fsGroup }}
runAsUser: {{ .Values.server.securityContext.runAsUser }}
{{- end }}
{{- if .Values.server.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.server.image.pullSecrets }}
- name: {{ . }}
{{- end}}
{{- end }}
{{- include "parse.imagePullSecrets" . | indent 6 }}
containers:
- name: {{ template "parse.fullname" . }}
image: {{ template "parse.server.image" . }}