diff options
author | 2018-04-24 20:15:37 +0000 | |
---|---|---|
committer | 2018-04-24 20:15:37 +0000 | |
commit | 9b8b40b53451c9f4e77e7e46a4356a229806bca9 (patch) | |
tree | 4c876464033ba2b795db51d59765c110e98a80eb /kubernetes/clamp | |
parent | 50be317746ff1c96231e9a95157868322c1f3676 (diff) | |
parent | 1ffbd99a2757af8e10d0f6af46177c646364f91b (diff) |
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/clamp')
-rw-r--r-- | kubernetes/clamp/charts/mariadb/templates/service.yaml | 6 | ||||
-rw-r--r-- | kubernetes/clamp/charts/mariadb/values.yaml | 3 | ||||
-rw-r--r-- | kubernetes/clamp/templates/service.yaml | 6 | ||||
-rw-r--r-- | kubernetes/clamp/values.yaml | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/kubernetes/clamp/charts/mariadb/templates/service.yaml b/kubernetes/clamp/charts/mariadb/templates/service.yaml index 6995f078ee..55221b13f7 100644 --- a/kubernetes/clamp/charts/mariadb/templates/service.yaml +++ b/kubernetes/clamp/charts/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/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml index a35c854973..486cbed9c8 100644 --- a/kubernetes/clamp/charts/mariadb/values.yaml +++ b/kubernetes/clamp/charts/mariadb/values.yaml @@ -76,7 +76,8 @@ persistence: service: type: ClusterIP - name: mariadb + name: clampdb + portName: clampdb internalPort: 3306 externalPort: 3306 diff --git a/kubernetes/clamp/templates/service.yaml b/kubernetes/clamp/templates/service.yaml index 59187228d1..ce29de9aee 100644 --- a/kubernetes/clamp/templates/service.yaml +++ b/kubernetes/clamp/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" . }} @@ -28,11 +28,11 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 9d586ac1e1..eef4dd7e65 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -84,6 +84,7 @@ readiness: service: type: NodePort name: clamp + portName: clamp internalPort: 8080 nodePort: 95 |