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>
80 lines
2.9 KiB
YAML
80 lines
2.9 KiB
YAML
{{- if .Values.migrate.enabled -}}
|
|
apiVersion: batch/v1
|
|
kind: Job
|
|
metadata:
|
|
{{- if .Values.migrate.useHook }}
|
|
name: {{ printf "%s-migrate" (include "oncall.engine.fullname" .) }}
|
|
annotations:
|
|
"helm.sh/hook": pre-install,pre-upgrade
|
|
{{- else }}
|
|
name: {{ printf "%s-migrate-%s" (include "oncall.engine.fullname" .) (now | date "2006-01-02-15-04-05") }}
|
|
{{- end }}
|
|
labels:
|
|
{{- include "oncall.engine.labels" . | nindent 4 }}
|
|
spec:
|
|
backoffLimit: 15
|
|
{{- if .Values.migrate.ttlSecondsAfterFinished }}
|
|
ttlSecondsAfterFinished: {{ .Values.migrate.ttlSecondsAfterFinished }}
|
|
{{- end }}
|
|
template:
|
|
metadata:
|
|
name: {{ printf "%s-migrate-%s" (include "oncall.engine.fullname" .) (now | date "2006-01-02-15-04-05") }}
|
|
{{- with .Values.podAnnotations }}
|
|
annotations:
|
|
random-annotation: {{ randAlphaNum 10 | lower }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
labels:
|
|
{{- include "oncall.engine.selectorLabels" . | nindent 8 }}
|
|
spec:
|
|
restartPolicy: Never
|
|
{{- with .Values.imagePullSecrets }}
|
|
imagePullSecrets:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
serviceAccountName: {{ include "oncall.serviceAccountName" . }}
|
|
securityContext:
|
|
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
|
{{- with .Values.migrate.nodeSelector }}
|
|
nodeSelector:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
containers:
|
|
- name: {{ .Chart.Name }}-migrate
|
|
securityContext:
|
|
{{- toYaml .Values.securityContext | nindent 12 }}
|
|
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
|
command:
|
|
- /bin/sh
|
|
- -c
|
|
{{- if eq .Values.database.type "mysql" }}
|
|
- |
|
|
until (nc -vz $MYSQL_HOST $MYSQL_PORT);
|
|
do
|
|
echo "waiting for MySQL"; sleep 1;
|
|
done
|
|
python manage.py migrate
|
|
{{- else if eq .Values.database.type "postgresql" }}
|
|
- |
|
|
until (nc -vz $DATABASE_HOST $DATABASE_PORT);
|
|
do
|
|
echo "waiting for PostgreSQL"; sleep 1;
|
|
done
|
|
python manage.py migrate
|
|
{{- end }}
|
|
env:
|
|
{{- include "snippet.oncall.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 }}
|
|
resources:
|
|
{{- toYaml .Values.engine.resources | nindent 12 }}
|
|
{{- end }}
|