Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SO] Use faster version of common secret template
[oom.git]
/
kubernetes
/
so
/
charts
/
so-mariadb
/
templates
/
job.yaml
diff --git
a/kubernetes/so/charts/so-mariadb/templates/job.yaml
b/kubernetes/so/charts/so-mariadb/templates/job.yaml
index
7e10e48
..
31868bd
100644
(file)
--- a/
kubernetes/so/charts/so-mariadb/templates/job.yaml
+++ b/
kubernetes/so/charts/so-mariadb/templates/job.yaml
@@
-20,7
+20,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": pre-upgrade,pre-install
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": pre-upgrade,pre-install
@@
-32,7
+32,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
name: {{ include "common.name" . }}
spec:
containers:
name: {{ include "common.name" . }}
spec:
containers:
@@
-43,14
+43,11
@@
spec:
- name: DB_HOST
value: {{ .Values.global.migration.dbHost }}
- name: DB_USER
- name: DB_HOST
value: {{ .Values.global.migration.dbHost }}
- name: DB_USER
-
value: {{ .Values.global.migration.dbUser
}}
+
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-backup-creds" "key" "login") | indent 10
}}
- name: DB_PORT
value: "{{ .Values.global.migration.dbPort }}"
- name: DB_PASS
- name: DB_PORT
value: "{{ .Values.global.migration.dbPort }}"
- name: DB_PASS
- valueFrom:
- secretKeyRef:
- name: {{ template "common.fullname" . }}-migration
- key: db-root-password-backup
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-backup-creds" "key" "password") | indent 10 }}
command:
- /bin/bash
- -c
command:
- /bin/bash
- -c
@@
-81,7
+78,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": post-upgrade,post-rollback,post-install
heritage: {{ .Release.Service }}
annotations:
"helm.sh/hook": post-upgrade,post-rollback,post-install
@@
-93,7
+90,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}-job
metadata:
labels:
app: {{ include "common.name" . }}-job
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
name: {{ include "common.name" . }}
spec:
initContainers:
name: {{ include "common.name" . }}
spec:
initContainers:
@@
-130,18
+127,15
@@
spec:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: DB_HOST
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
key: mariadb.readwrite.host
- name: DB_PORT
valueFrom:
secretKeyRef:
- name: {{
.Release.Name
}}-so-db-secrets
+ name: {{
include "common.release" .
}}-so-db-secrets
key: mariadb.readwrite.port
- name: MYSQL_ROOT_PASSWORD
key: mariadb.readwrite.port
- name: MYSQL_ROOT_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ template "common.fullname" . }}
- key: db-root-password
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-root-pass" "key" "password") | indent 10 }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
volumeMounts:
- mountPath: /etc/localtime
name: localtime