summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/charts/portal-mariadb
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 07:56:27 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 13:23:19 +0000
commit1ffbd99a2757af8e10d0f6af46177c646364f91b (patch)
treeceb97b36e0e6ae50349f6495dc585b4ebd61d3f6 /kubernetes/portal/charts/portal-mariadb
parent23a95a751a002163f61cb7eafb4dc84465415daa (diff)
Make all services independent of helm Release.Name
Issue-ID: OOM-906 Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/portal/charts/portal-mariadb')
-rw-r--r--kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/templates/job.yaml6
-rw-r--r--kubernetes/portal/charts/portal-mariadb/templates/service.yaml6
-rw-r--r--kubernetes/portal/charts/portal-mariadb/values.yaml3
4 files changed, 9 insertions, 8 deletions
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
index bdb760d24d..acb26a227f 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: "{{ include "common.fullname" . }}"
+ value: "{{ include "common.servicename" . }}"
- 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 5dad1c0002..b6eea900b9 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: "{{ include "common.fullname" . }}"
+ value: "{{ include "common.servicename" . }}"
- 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: "{{ include "common.fullname" . }}"
+ value: "{{ include "common.servicename" . }}"
- name: DB_USER
value: {{ .Values.config.mariadbUser }}
- name: DB_PORT
@@ -87,4 +87,4 @@ spec:
name: {{ include "common.fullname" . }}-mariadb
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Never \ No newline at end of file
+ restartPolicy: Never
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml b/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
index 11b3b48bd9..2e0c0be596 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -32,7 +32,7 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
{{- end}}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index c7ecea59f1..8118db330f 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -82,7 +82,8 @@ persistence:
service:
type: ClusterIP
- name: mariadb
+ name: portal-db
+ portName: portal-db
externalPort: 3306
internalPort: 3306