diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-04-24 20:15:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-24 20:15:37 +0000 |
| commit | 9b8b40b53451c9f4e77e7e46a4356a229806bca9 (patch) | |
| tree | 4c876464033ba2b795db51d59765c110e98a80eb /kubernetes/common/mysql | |
| parent | 50be317746ff1c96231e9a95157868322c1f3676 (diff) | |
| parent | 1ffbd99a2757af8e10d0f6af46177c646364f91b (diff) | |
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/common/mysql')
| -rw-r--r-- | kubernetes/common/mysql/templates/nfs-provisoner.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/common/mysql/templates/service.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/common/mysql/values.yaml | 1 |
3 files changed, 11 insertions, 10 deletions
diff --git a/kubernetes/common/mysql/templates/nfs-provisoner.yaml b/kubernetes/common/mysql/templates/nfs-provisoner.yaml index 35894df7a7..d6c6e8ccbd 100644 --- a/kubernetes/common/mysql/templates/nfs-provisoner.yaml +++ b/kubernetes/common/mysql/templates/nfs-provisoner.yaml @@ -18,7 +18,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ .Release.Name }}-{{ .Values.nfsprovisionerPrefix }}-nfs-provisioner + name: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -62,7 +62,7 @@ spec: fieldRef: fieldPath: status.podIP - name: SERVICE_NAME - value: {{ .Release.Name }}-{{ .Values.nfsprovisionerPrefix }}-nfs-provisioner + value: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner - name: POD_NAMESPACE valueFrom: fieldRef: diff --git a/kubernetes/common/mysql/templates/service.yaml b/kubernetes/common/mysql/templates/service.yaml index 032920c760..ed4f72adc5 100644 --- a/kubernetes/common/mysql/templates/service.yaml +++ b/kubernetes/common/mysql/templates/service.yaml @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -27,7 +27,7 @@ metadata: spec: ports: - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} @@ -37,7 +37,7 @@ spec: kind: Service apiVersion: v1 metadata: - name: {{ .Release.Name }}-{{ .Values.nfsprovisionerPrefix }}-nfs-provisioner + name: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner namespace: {{ include "common.namespace" . }} labels: app: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner @@ -61,14 +61,14 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }}-read + name: {{ include "common.servicename" . }}-read namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} spec: ports: - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} @@ -83,7 +83,7 @@ metadata: spec: ports: - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} @@ -99,7 +99,7 @@ metadata: spec: ports: - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} @@ -109,7 +109,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }}-nodeport + name: {{ include "common.servicename" . }}-nodeport namespace: {{ include "common.namespace" . }} labels: statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0 diff --git a/kubernetes/common/mysql/values.yaml b/kubernetes/common/mysql/values.yaml index 40310a89d7..028a440c01 100644 --- a/kubernetes/common/mysql/values.yaml +++ b/kubernetes/common/mysql/values.yaml @@ -80,6 +80,7 @@ persistence: service: name: mysql + portName: mysql internalPort: 3306 # nfs provisioner ports nfsPort: 2049 |