d3247447ef
# What this PR does 1. Fixes setting extra envs using: ```yaml env: proxy: http://example.com SOME_VAR: some-value ``` It had failed if postgresql setting enabled and in `job-migrate` 2. Fixes an issue if custom database and username set for internal mariadb, `MYSQL_` envs did not use them ```yaml mariadb: auth: database: grafana_oncall username: grafana_oncall ``` 3. Added `imagePullSecrets: []` to values.yaml. It used in helm chart, but does not present in the values.yaml 4. More unit tests ## Which issue(s) this PR fixes ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) Co-authored-by: Ildar Iskhakov <Ildar.iskhakov@grafana.com>
77 lines
No EOL
3.1 KiB
Smarty
77 lines
No EOL
3.1 KiB
Smarty
{{- define "template.oncall.celery.deployment" -}}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: {{ include "oncall.celery.fullname" . }}
|
|
labels:
|
|
{{- include "oncall.celery.labels" . | nindent 4 }}
|
|
spec:
|
|
replicas: {{ .Values.celery.replicaCount }}
|
|
selector:
|
|
matchLabels:
|
|
{{- include "oncall.celery.selectorLabels" . | nindent 6 }}
|
|
template:
|
|
metadata:
|
|
{{- with .Values.podAnnotations }}
|
|
annotations:
|
|
random-annotation: {{ randAlphaNum 10 | lower }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
labels:
|
|
{{- include "oncall.celery.selectorLabels" . | nindent 8 }}
|
|
spec:
|
|
{{- with .Values.imagePullSecrets }}
|
|
imagePullSecrets:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
serviceAccountName: {{ include "oncall.serviceAccountName" . }}
|
|
securityContext:
|
|
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
|
initContainers:
|
|
{{- if eq .Values.database.type "mysql" }}
|
|
{{- include "oncall.mariadb.wait-for-db" . | indent 8 }}
|
|
{{- end }}
|
|
{{- if eq .Values.database.type "postgresql" }}
|
|
{{- include "oncall.postgresql.wait-for-db" . | indent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.celery.nodeSelector }}
|
|
nodeSelector:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
containers:
|
|
- name: {{ .Chart.Name }}
|
|
securityContext:
|
|
{{- toYaml .Values.securityContext | nindent 12 }}
|
|
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
|
command: ["./celery_with_exporter.sh"]
|
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
|
env:
|
|
{{- include "snippet.celery.env" . | nindent 12 }}
|
|
{{- include "snippet.oncall.env" . | nindent 12 }}
|
|
{{- include "snippet.oncall.slack.env" . | nindent 12 }}
|
|
{{- include "snippet.oncall.telegram.env" . | nindent 12 }}
|
|
{{- include "snippet.oncall.smtp.env" . | nindent 12 }}
|
|
{{- if eq .Values.database.type "mysql" }}
|
|
{{- include "snippet.mysql.env" . | nindent 12 }}
|
|
{{- end }}
|
|
{{- if eq .Values.database.type "postgresql" }}
|
|
{{- include "snippet.postgresql.env" . | nindent 12 }}
|
|
{{- end }}
|
|
{{- include "snippet.rabbitmq.env" . | nindent 12 }}
|
|
{{- include "snippet.redis.env" . | nindent 12 }}
|
|
{{- include "oncall.extraEnvs" . | nindent 12 }}
|
|
{{- if .Values.celery.livenessProbe.enabled }}
|
|
livenessProbe:
|
|
exec:
|
|
command: [
|
|
"bash",
|
|
"-c",
|
|
"celery -A engine inspect ping -d celery@$HOSTNAME"
|
|
]
|
|
initialDelaySeconds: {{ .Values.celery.livenessProbe.initialDelaySeconds }}
|
|
periodSeconds: {{ .Values.celery.livenessProbe.periodSeconds }}
|
|
timeoutSeconds: {{ .Values.celery.livenessProbe.timeoutSeconds }}
|
|
{{- end }}
|
|
resources:
|
|
{{- toYaml .Values.celery.resources | nindent 12 }}
|
|
{{- end}} |