Merge "Make all services independent of helm Release.Name"

2 files changed, 17 insertions, 19 deletions

diff --git a/kubernetes/sdnc/templates/service.yaml b/kubernetes/sdnc/templates/service.yaml
index 487368e721..586144b6e9 100644
--- a/kubernetes/sdnc/templates/service.yaml
+++ b/kubernetes/sdnc/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" . }}
@@ -41,19 +41,19 @@ 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 }}
       targetPort: {{ .Values.service.internalPort2 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      name: "{{ .Values.service.name }}-8202"
+      name: "{{ .Values.service.portName }}-8202"
     - port: {{ .Values.service.externalPort3 }}
       targetPort: {{ .Values.service.internalPort3 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
-      name: "{{ .Values.service.name }}-8280"
+      name: "{{ .Values.service.portName }}-8280"
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
@@ -62,7 +62,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}-cluster
+  name: {{ .Values.service.portName }}-cluster
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -71,7 +71,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:
@@ -85,17 +85,17 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sdnhost-{{ include "common.fullname" . }}-0
+  name: sdnhost-{{ include "common.servicename" . }}-0
   namespace: {{ .Release.Namespace }}
   labels:
     statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0
 spec:
   ports:
-  - name: {{ include "common.fullname" . }}-0-port-{{ .Values.service.internalPort4 }}
+  - name: {{ .Values.service.portName }}-0-port-{{ .Values.service.internalPort4 }}
     port: {{ .Values.service.clusterPort2 }}
     targetPort: {{ .Values.service.internalPort4 }}
     nodePort: {{ .Values.nodePortPrefix }}{{ .Values.service.geoNodePort4 }}
-  - name: {{ include "common.fullname" . }}-0-port-{{ .Values.service.internalPort }}
+  - name: {{ .Values.service.portName }}-0-port-{{ .Values.service.internalPort }}
     port: {{ .Values.service.clusterPort3 }}
     targetPort: {{ .Values.service.internalPort }}
     nodePort: {{ .Values.nodePortPrefix }}{{ .Values.service.geoNodePort1 }}
@@ -108,17 +108,17 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sdnhost-{{ include "common.fullname" . }}-1
+  name: sdnhost-{{ include "common.servicename" . }}-1
   namespace: {{ .Release.Namespace }}
   labels:
     statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-1
 spec:
   ports:
-  - name: {{ include "common.fullname" . }}-1-port-{{ .Values.service.internalPort4 }}
+  - name: {{ .Values.service.portName }}-1-port-{{ .Values.service.internalPort4 }}
     port: {{ .Values.service.clusterPort2 }}
     targetPort: {{ .Values.service.internalPort4 }}
     nodePort: {{ .Values.nodePortPrefix }}{{ .Values.service.geoNodePort5 }}
-  - name: {{ include "common.fullname" . }}-1-port-{{ .Values.service.internalPort }}
+  - name: {{ .Values.service.portName }}-1-port-{{ .Values.service.internalPort }}
     port: {{ .Values.service.clusterPort3 }}
     targetPort: {{ .Values.service.internalPort }}
     nodePort: {{ .Values.nodePortPrefix }}{{ .Values.service.geoNodePort2 }}
@@ -131,23 +131,21 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: sdnhost-{{ include "common.fullname" . }}-2
+  name: sdnhost-{{ include "common.servicename" . }}-2
   namespace: {{ .Release.Namespace }}
   labels:
     statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-2
 spec:
   ports:
-  - name: {{ include "common.fullname" . }}-2-port-{{ .Values.service.internalPort4 }}
+  - name: {{ .Values.service.portName }}-2-port-{{ .Values.service.internalPort4 }}
     port: {{ .Values.service.clusterPort2 }}
     targetPort: {{ .Values.service.internalPort4 }}
     nodePort: {{ .Values.nodePortPrefix }}{{ .Values.service.geoNodePort6 }}
-  - name: {{ include "common.fullname" . }}-2-port-{{ .Values.service.internalPort }}
+  - name: {{ .Values.service.portName }}-2-port-{{ .Values.service.internalPort }}
     port: {{ .Values.service.clusterPort3 }}
     targetPort: {{ .Values.service.internalPort }}
     nodePort: {{ .Values.nodePortPrefix }}{{ .Values.service.geoNodePort3 }}
   type: NodePort
   selector:
     statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-2
----
 {{ end }}
-
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 8b4055e1df..55eaf2b4d0 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -23,7 +23,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  serviceName: "{{ .Values.service.name }}-cluster"
+  serviceName: {{ include "common.servicename" . }}-cluster
   replicas: {{ .Values.replicaCount }}
   podManagementPolicy: Parallel
   template: