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/sdc/charts/sdc-es | |
| parent | 50be317746ff1c96231e9a95157868322c1f3676 (diff) | |
| parent | 1ffbd99a2757af8e10d0f6af46177c646364f91b (diff) | |
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-es')
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/templates/service.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/values.yaml | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml index 699dfc310d..3ec8c563c9 100644 --- a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml @@ -115,4 +115,4 @@ spec: - name: {{ include "common.fullname" . }}-logs emptyDir: {} imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/sdc/charts/sdc-es/templates/service.yaml b/kubernetes/sdc/charts/sdc-es/templates/service.yaml index 30297a3369..805eaa3936 100644 --- a/kubernetes/sdc/charts/sdc-es/templates/service.yaml +++ b/kubernetes/sdc/charts/sdc-es/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,18 +28,18 @@ 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 }} - port: {{ .Values.service.internalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName }}2 {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.externalPort2 }} targetPort: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName }}2 {{- end}} selector: app: {{ include "common.name" . }} - release: {{ .Release.Name }}
\ No newline at end of file + release: {{ .Release.Name }} diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml index db8e6b753c..32c54fe762 100644 --- a/kubernetes/sdc/charts/sdc-es/values.yaml +++ b/kubernetes/sdc/charts/sdc-es/values.yaml @@ -65,6 +65,7 @@ readiness: service: type: ClusterIP name: sdc-es + portName: sdc-es externalPort: 9200 internalPort: 9200 externalPort2: 9300 |