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/appc/templates/service.yaml | |
| parent | 50be317746ff1c96231e9a95157868322c1f3676 (diff) | |
| parent | 1ffbd99a2757af8e10d0f6af46177c646364f91b (diff) | |
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/appc/templates/service.yaml')
| -rw-r--r-- | kubernetes/appc/templates/service.yaml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml index 6ffef221a6..6c85985854 100644 --- a/kubernetes/appc/templates/service.yaml +++ b/kubernetes/appc/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -27,14 +27,17 @@ spec: - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: "{{ .Values.service.name }}-8282" + name: "{{ .Values.service.portName }}-8282" - port: {{ .Values.service.externalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: "{{ .Values.service.name }}-1830" + name: "{{ .Values.service.portName }}-1830" {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }}-8282 + - port: {{ .Values.service.externalPort2 }} + targetPort: {{ .Values.service.internalPort2 }} + name: {{ .Values.service.portName }}-1830 {{- end}} selector: app: {{ include "common.name" . }} @@ -43,7 +46,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }}-cluster + name: {{ include "common.servicename" . }}-cluster namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -52,7 +55,7 @@ metadata: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: ports: - - name: "{{ .Values.service.name }}-cluster-port" + - name: "{{ .Values.service.portName }}-cluster-port" port: {{ .Values.service.clusterPort }} clusterIP: None selector: |