Avoid conflicts with bitnami common
This commit is contained in:
parent
0d5921af5e
commit
012ee05ab9
|
@ -1,9 +1,9 @@
|
||||||
{{/*
|
{{/*
|
||||||
Renders a value that contains template.
|
Renders a value that contains template.
|
||||||
Usage:
|
Usage:
|
||||||
{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
|
{{ include "django.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "common.tplvalues.render" -}}
|
{{- define "django.tplvalues.render" -}}
|
||||||
{{- if typeIs "string" .value }}
|
{{- if typeIs "string" .value }}
|
||||||
{{- tpl .value .context }}
|
{{- tpl .value .context }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
|
|
@ -20,7 +20,7 @@ spec:
|
||||||
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
||||||
tag: "{{ .Values.image.tag }}"
|
tag: "{{ .Values.image.tag }}"
|
||||||
{{- if .Values.beat.podAnnotations }}
|
{{- if .Values.beat.podAnnotations }}
|
||||||
{{- include "common.tplvalues.render" ( dict "value" .Values.beat.podAnnotations "context" $ ) | nindent 8 }}
|
{{- include "django.tplvalues.render" ( dict "value" .Values.beat.podAnnotations "context" $ ) | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "django.selectorLabels" . | nindent 8 }}
|
{{- include "django.selectorLabels" . | nindent 8 }}
|
||||||
|
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
|
checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
|
||||||
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
||||||
{{- if .Values.flower.podAnnotations }}
|
{{- if .Values.flower.podAnnotations }}
|
||||||
{{- include "common.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
|
{{- include "django.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "django.selectorLabels" . | nindent 8 }}
|
{{- include "django.selectorLabels" . | nindent 8 }}
|
||||||
|
|
|
@ -20,7 +20,7 @@ spec:
|
||||||
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
||||||
tag: "{{ .Values.image.tag }}"
|
tag: "{{ .Values.image.tag }}"
|
||||||
{{- if .Values.web.podAnnotations }}
|
{{- if .Values.web.podAnnotations }}
|
||||||
{{- include "common.tplvalues.render" ( dict "value" .Values.web.podAnnotations "context" $ ) | nindent 8 }}
|
{{- include "django.tplvalues.render" ( dict "value" .Values.web.podAnnotations "context" $ ) | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "django.selectorLabels" . | nindent 8 }}
|
{{- include "django.selectorLabels" . | nindent 8 }}
|
||||||
|
|
|
@ -19,7 +19,7 @@ spec:
|
||||||
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
||||||
tag: "{{ .Values.image.tag }}"
|
tag: "{{ .Values.image.tag }}"
|
||||||
{{- if .Values.worker.podAnnotations }}
|
{{- if .Values.worker.podAnnotations }}
|
||||||
{{- include "common.tplvalues.render" ( dict "value" .Values.worker.podAnnotations "context" $ ) | nindent 8 }}
|
{{- include "django.tplvalues.render" ( dict "value" .Values.worker.podAnnotations "context" $ ) | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "django.selectorLabels" . | nindent 8 }}
|
{{- include "django.selectorLabels" . | nindent 8 }}
|
||||||
|
|
Loading…
Reference in a new issue