Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VID] Use mariadb galera common chart
[oom.git]
/
kubernetes
/
vid
/
templates
/
job.yaml
diff --git
a/kubernetes/vid/templates/job.yaml
b/kubernetes/vid/templates/job.yaml
index
5214e71
..
c2a1858
100644
(file)
--- a/
kubernetes/vid/templates/job.yaml
+++ b/
kubernetes/vid/templates/job.yaml
@@
-34,11
+34,8
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /root/ready.py
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /root/ready.py
-{{- $fullname := include "common.fullname" . -}}
-{{- range $i,$t := until (int .Values.vid_mariadb_galera.replicaCount)}}
- --container-name
- --container-name
- - {{ $fullname }}-mariadb-galera-{{$i}}
-{{- end }}
+ - {{ index .Values "mariadb-galera" "service" "name" }}
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-63,13
+60,16
@@
spec:
- /dbcmd-config/db_cmd.sh
env:
- name: MYSQL_PASSWORD
- /dbcmd-config/db_cmd.sh
env:
- name: MYSQL_PASSWORD
- value: "{{ .Values.config.vidmysqlpassword }}"
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}-db
+ key: db-user-password
- name: MYSQL_HOST
- name: MYSQL_HOST
- value:
"{{ .Values.config.vidmysqlhost }}"
+ value:
{{ index .Values "mariadb-galera" "service" "name" }}
- name: MYSQL_USER
- name: MYSQL_USER
- value:
"{{ .Values.config.vidmysqluser }}"
+ value:
{{ index .Values "mariadb-galera" "config" "userName" }}
- name: MYSQL_PORT
- name: MYSQL_PORT
- value: "{{
.Values.config.vidmysqlport
}}"
+ value: "{{
index .Values "mariadb-galera" "service" "internalPort"
}}"
restartPolicy: Never
volumes:
- name: {{ include "common.fullname" . }}-config
restartPolicy: Never
volumes:
- name: {{ include "common.fullname" . }}-config
@@
-80,4
+80,3
@@
spec:
path: db_cmd.sh
- key: vid-pre-init.sql
path: vid-pre-init.sql
path: db_cmd.sh
- key: vid-pre-init.sql
path: vid-pre-init.sql
-