commit 1ffbd99a2757af8e10d0f6af46177c646364f91b
author BorislavG <Borislav.Glozman@amdocs.com> Tue Apr 24 07:56:27 2018 +0000
committer BorislavG <Borislav.Glozman@amdocs.com> Tue Apr 24 13:23:19 2018 +0000
tree ceb97b36e0e6ae50349f6495dc585b4ebd61d3f6
parent 23a95a751a002163f61cb7eafb4dc84465415daa

Make all services independent of helm Release.Name

Issue-ID: OOM-906
Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

kubernetes/clamp/charts/mariadb/templates/service.yaml

diff --git a/kubernetes/clamp/charts/mariadb/templates/service.yaml b/kubernetes/clamp/charts/mariadb/templates/service.yaml
index 6995f07..55221b1 100644
--- a/kubernetes/clamp/charts/mariadb/templates/service.yaml
+++ b/kubernetes/clamp/charts/mariadb/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" . }}
@@ -32,7 +32,7 @@
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
     {{- end}}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}

kubernetes/clamp/charts/mariadb/values.yaml

diff --git a/kubernetes/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml
index a35c854..486cbed 100644
--- a/kubernetes/clamp/charts/mariadb/values.yaml
+++ b/kubernetes/clamp/charts/mariadb/values.yaml
@@ -76,7 +76,8 @@
 
 service:
   type: ClusterIP
-  name: mariadb
+  name: clampdb
+  portName: clampdb
   internalPort: 3306
   externalPort: 3306
 

kubernetes/clamp/templates/service.yaml

diff --git a/kubernetes/clamp/templates/service.yaml b/kubernetes/clamp/templates/service.yaml
index 5918722..ce29de9 100644
--- a/kubernetes/clamp/templates/service.yaml
+++ b/kubernetes/clamp/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,11 +28,11 @@
     {{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 }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}

kubernetes/clamp/values.yaml

diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 9d586ac..eef4dd7 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -84,6 +84,7 @@
 service:
   type: NodePort
   name: clamp
+  portName: clamp
   internalPort: 8080
   nodePort: 95