Merge branch 'flower-docker' into 'master'
Default to mher/flower See merge request burke-software/django-helm-chart!9
This commit is contained in:
commit
0d5921af5e
|
@ -17,7 +17,6 @@ spec:
|
||||||
annotations:
|
annotations:
|
||||||
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 }}
|
||||||
tag: "{{ .Values.image.tag }}"
|
|
||||||
{{- if .Values.flower.podAnnotations }}
|
{{- if .Values.flower.podAnnotations }}
|
||||||
{{- include "common.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
|
{{- include "common.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -25,7 +24,7 @@ spec:
|
||||||
{{- include "django.selectorLabels" . | nindent 8 }}
|
{{- include "django.selectorLabels" . | nindent 8 }}
|
||||||
app.kubernetes.io/component: flower
|
app.kubernetes.io/component: flower
|
||||||
spec:
|
spec:
|
||||||
{{- with .Values.imagePullSecrets }}
|
{{- with .Values.flower.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -38,8 +37,8 @@ spec:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
securityContext:
|
securityContext:
|
||||||
{{- toYaml .Values.securityContext | nindent 12 }}
|
{{- toYaml .Values.securityContext | nindent 12 }}
|
||||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
image: "{{ .Values.flower.image.repository }}:{{ .Values.flower.image.tag }}"
|
||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.flower.image.pullPolicy }}
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5555
|
- containerPort: 5555
|
||||||
name: http
|
name: http
|
||||||
|
|
|
@ -134,6 +134,10 @@ beat:
|
||||||
|
|
||||||
flower:
|
flower:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
image:
|
||||||
|
repository: mher/flower
|
||||||
|
tag: latest
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
|
|
Loading…
Reference in a new issue