diff options
author | 2018-04-24 20:15:37 +0000 | |
---|---|---|
committer | 2018-04-24 20:15:37 +0000 | |
commit | 9b8b40b53451c9f4e77e7e46a4356a229806bca9 (patch) | |
tree | 4c876464033ba2b795db51d59765c110e98a80eb /kubernetes/aaf/charts/sms | |
parent | 50be317746ff1c96231e9a95157868322c1f3676 (diff) | |
parent | 1ffbd99a2757af8e10d0f6af46177c646364f91b (diff) |
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/aaf/charts/sms')
4 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml b/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml index 1ba8580840..18334a301c 100644 --- a/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml +++ b/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.fullname" . }} @@ -25,7 +25,7 @@ metadata: spec: type: {{ .Values.service.type }} ports: - - name: {{ .Values.service.name }} + - name: {{ .Values.service.PortName }} {{if eq .Values.service.type "NodePort" -}} port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }} diff --git a/kubernetes/aaf/charts/sms/charts/vault/values.yaml b/kubernetes/aaf/charts/sms/charts/vault/values.yaml index 331bc434b4..2bce18106f 100644 --- a/kubernetes/aaf/charts/sms/charts/vault/values.yaml +++ b/kubernetes/aaf/charts/sms/charts/vault/values.yaml @@ -86,6 +86,7 @@ persistence: service: type: NodePort name: aaf-sms-db + portName: aaf-sms-db internalPort: 8200 nodePort: 44 diff --git a/kubernetes/aaf/charts/sms/templates/service.yaml b/kubernetes/aaf/charts/sms/templates/service.yaml index 1ba8580840..04e9a5a92f 100644 --- a/kubernetes/aaf/charts/sms/templates/service.yaml +++ b/kubernetes/aaf/charts/sms/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.fullname" . }} @@ -25,7 +25,7 @@ metadata: spec: type: {{ .Values.service.type }} ports: - - name: {{ .Values.service.name }} + - name: {{ .Values.service.portName }} {{if eq .Values.service.type "NodePort" -}} port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }} diff --git a/kubernetes/aaf/charts/sms/values.yaml b/kubernetes/aaf/charts/sms/values.yaml index 0c537c525a..05d4e79e6b 100644 --- a/kubernetes/aaf/charts/sms/values.yaml +++ b/kubernetes/aaf/charts/sms/values.yaml @@ -69,6 +69,7 @@ readiness: service: type: NodePort name: aaf-sms + portName: aaf-sms internalPort: 10443 nodePort: 43 |