diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-11-14 09:28:12 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-11-18 17:04:02 +0100 |
| commit | 6383c4401160839e206b62f7cdba85f1c08cf7e2 (patch) | |
| tree | bef1ab1995765a42f637d18c4e2ae5442de6d4e5 /kubernetes/vid/templates/job.yaml | |
| parent | 0b844c9a74e29e2046c96f4635c429eb4dc8d677 (diff) | |
[VID] Use mariadb galera common chart
Instead of using "own" galera chart, reuse chart placed in common part
of OOM installation.
Will ease move to common galera cluster (which is not done by this
commit).
Change-Id: I843c89ed4899055e9502268089d0e01f28fe37ae
Issue-ID: VID-704
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/vid/templates/job.yaml')
| -rw-r--r-- | kubernetes/vid/templates/job.yaml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/kubernetes/vid/templates/job.yaml b/kubernetes/vid/templates/job.yaml index 5214e71130..c2a1858d0c 100644 --- 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 -{{- $fullname := include "common.fullname" . -}} -{{- range $i,$t := until (int .Values.vid_mariadb_galera.replicaCount)}} - --container-name - - {{ $fullname }}-mariadb-galera-{{$i}} -{{- end }} + - {{ index .Values "mariadb-galera" "service" "name" }} env: - name: NAMESPACE valueFrom: @@ -63,13 +60,16 @@ spec: - /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 - value: "{{ .Values.config.vidmysqlhost }}" + value: {{ index .Values "mariadb-galera" "service" "name" }} - name: MYSQL_USER - value: "{{ .Values.config.vidmysqluser }}" + value: {{ index .Values "mariadb-galera" "config" "userName" }} - name: MYSQL_PORT - value: "{{ .Values.config.vidmysqlport }}" + value: "{{ index .Values "mariadb-galera" "service" "internalPort" }}" 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 - |