summaryrefslogtreecommitdiffstats
path: root/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2021-10-06 16:59:13 +0000
committerGerrit Code Review <gerrit@onap.org>2021-10-06 16:59:13 +0000
commit47b8de5e8160d367f70115bb0c8caa758e60f3f1 (patch)
tree65bfdac00178c19ba17826b687ddaf5175fba2ae /kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
parentb25e952952db88f739dba11246bdf17ed785f6e5 (diff)
parenta74326fc152d115af5ffa1eae61d592a9e3ca74f (diff)
Merge "[VFC] Use common mariadb-galera instance"
Diffstat (limited to 'kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml')
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index 9c8430c9fc..f9a8ba71f2 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
- /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:
@@ -58,7 +58,7 @@ spec:
- sh
args:
- -c
- - 'MYSQL_AUTH=root:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh'
+ - 'MYSQL_AUTH=${MYSQL_ROOT_USER}:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh'
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
@@ -83,7 +83,7 @@ spec:
- 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: REDIS_HOST
value: "{{ .Values.global.config.redisServiceName }}"
- name: REDIS_PORT