diff options
author | 2018-04-06 19:32:27 +0000 | |
---|---|---|
committer | 2018-04-06 19:32:27 +0000 | |
commit | 6cfff80ec93d4a4fa3bdeb5289a70c4296560db1 (patch) | |
tree | 553852a0f3bbcb695a0c6e7f8b854b84f149fe65 /kubernetes/portal/charts/portal-mariadb/templates | |
parent | dc4a88493697af864298eda18895c7af50f4de0a (diff) | |
parent | 454e2fd0872dfe433e3edacdf69fde523b32c5a0 (diff) |
Merge "Correcting portal k8s configmap service names"
Diffstat (limited to 'kubernetes/portal/charts/portal-mariadb/templates')
-rw-r--r-- | kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml | 2 | ||||
-rw-r--r-- | kubernetes/portal/charts/portal-mariadb/templates/job.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml index 4d58e43b28..bdb760d24d 100644 --- a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml +++ b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml @@ -52,7 +52,7 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: MYSQL_HOST - value: "{{ .Values.service.name }}" + value: "{{ include "common.fullname" . }}" - name: MYSQL_ROOT_PASSWORD valueFrom: secretKeyRef: diff --git a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml index 75d5bb0874..af14f44129 100644 --- a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml +++ b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml @@ -51,7 +51,7 @@ spec: imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: DB_HOST - value: "{{ .Release.Name }}-{{ .Values.service.name }}" + value: "{{ include "common.fullname" . }}" - name: DB_USER value: {{ .Values.config.mariadbUser }} - name: DB_PASS @@ -64,7 +64,7 @@ spec: imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: DB_HOST - value: "{{ .Release.Name }}-{{ .Values.service.name }}" + value: "{{ include "common.fullname" . }}" - name: DB_USER value: {{ .Values.config.mariadbUser }} - name: DB_PORT |