diff options
author | BorislavG <Borislav.Glozman@amdocs.com> | 2018-04-24 07:56:27 +0000 |
---|---|---|
committer | BorislavG <Borislav.Glozman@amdocs.com> | 2018-04-24 13:23:19 +0000 |
commit | 1ffbd99a2757af8e10d0f6af46177c646364f91b (patch) | |
tree | ceb97b36e0e6ae50349f6495dc585b4ebd61d3f6 /kubernetes/vfc/charts/vfc-catalog | |
parent | 23a95a751a002163f61cb7eafb4dc84465415daa (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/vfc/charts/vfc-catalog')
-rw-r--r-- | kubernetes/vfc/charts/vfc-catalog/templates/service.yaml | 8 | ||||
-rw-r--r-- | kubernetes/vfc/charts/vfc-catalog/values.yaml | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml b/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml index 7d3390e761..9fa3e4f12c 100644 --- a/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml +++ b/kubernetes/vfc/charts/vfc-catalog/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" . }} @@ -40,12 +40,12 @@ spec: - port: {{ .Values.service.externalPort }} targetPort: {{ .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" . }} - release: {{ .Release.Name }}
\ No newline at end of file + release: {{ .Release.Name }} diff --git a/kubernetes/vfc/charts/vfc-catalog/values.yaml b/kubernetes/vfc/charts/vfc-catalog/values.yaml index 0485b57890..77b96139cb 100644 --- a/kubernetes/vfc/charts/vfc-catalog/values.yaml +++ b/kubernetes/vfc/charts/vfc-catalog/values.yaml @@ -59,6 +59,7 @@ readiness: service: type: ClusterIP name: vfc-catalog + portName: vfc-catalog externalPort: 8806 internalPort: 8806 # nodePort: 30806 |