Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VFC] Use common mariadb-galera instance
[oom.git]
/
kubernetes
/
vfc
/
components
/
vfc-nslcm
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index
40ca646
..
17d8cc2
100644
(file)
--- a/
kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/
kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@
-42,7
+42,7
@@
spec:
- /app/ready.py
args:
- --container-name
- /app/ready.py
args:
- --container-name
- -
{{ .Values.config.mariadbService }}
+ -
'{{ ternary (index .Values "mariadb-galera" "nameOverride") .Values.global.mariadbGalera.service .Values.global.mariadbGalera.localCluster }}'
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-83,7
+83,7
@@
spec:
- name: SSL_ENABLED
value: "{{ .Values.global.config.ssl_enabled }}"
- name: MYSQL_ADDR
- name: SSL_ENABLED
value: "{{ .Values.global.config.ssl_enabled }}"
- name: MYSQL_ADDR
- value:
"{{ .Values.config.mariadbService }}:{{ .Values.config.mariadbPort }}"
+ value:
'{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}'
- name: MYSQL_ROOT_USER
value: "{{ .Values.global.config.mariadb_admin }}"
- name: MYSQL_ROOT_PASSWORD
- name: MYSQL_ROOT_USER
value: "{{ .Values.global.config.mariadb_admin }}"
- name: MYSQL_ROOT_PASSWORD