summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/charts/sdc-be
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-24 20:15:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-24 20:15:37 +0000
commit9b8b40b53451c9f4e77e7e46a4356a229806bca9 (patch)
tree4c876464033ba2b795db51d59765c110e98a80eb /kubernetes/sdc/charts/sdc-be
parent50be317746ff1c96231e9a95157868322c1f3676 (diff)
parent1ffbd99a2757af8e10d0f6af46177c646364f91b (diff)
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-be')
-rw-r--r--kubernetes/sdc/charts/sdc-be/templates/service.yaml12
-rw-r--r--kubernetes/sdc/charts/sdc-be/values.yaml1
2 files changed, 7 insertions, 6 deletions
diff --git a/kubernetes/sdc/charts/sdc-be/templates/service.yaml b/kubernetes/sdc/charts/sdc-be/templates/service.yaml
index ec9d3004f5..d59f341b2a 100644
--- a/kubernetes/sdc/charts/sdc-be/templates/service.yaml
+++ b/kubernetes/sdc/charts/sdc-be/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" . }}
@@ -48,18 +48,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-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml
index ad63ad8e60..45b5425599 100644
--- a/kubernetes/sdc/charts/sdc-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-be/values.yaml
@@ -61,6 +61,7 @@ readiness:
service:
type: NodePort
name: sdc-be
+ portName: sdc-be
nodePort: "04"
internalPort: 8443
nodePort2: "05"