Make all services independent of helm Release.Name
Issue-ID: OOM-906
Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/charts/aaf-cs/templates/service.yaml b/charts/aaf-cs/templates/service.yaml
index facf3ce..2e4a619 100644
--- a/charts/aaf-cs/templates/service.yaml
+++ b/charts/aaf-cs/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" . }}
diff --git a/charts/sms/charts/vault/templates/service.yaml b/charts/sms/charts/vault/templates/service.yaml
index 1ba8580..18334a3 100644
--- a/charts/sms/charts/vault/templates/service.yaml
+++ b/charts/sms/charts/vault/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.name }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.fullname" . }}
@@ -25,7 +25,7 @@
spec:
type: {{ .Values.service.type }}
ports:
- - name: {{ .Values.service.name }}
+ - name: {{ .Values.service.PortName }}
{{if eq .Values.service.type "NodePort" -}}
port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
diff --git a/charts/sms/charts/vault/values.yaml b/charts/sms/charts/vault/values.yaml
index 331bc43..2bce181 100644
--- a/charts/sms/charts/vault/values.yaml
+++ b/charts/sms/charts/vault/values.yaml
@@ -86,6 +86,7 @@
service:
type: NodePort
name: aaf-sms-db
+ portName: aaf-sms-db
internalPort: 8200
nodePort: 44
diff --git a/charts/sms/templates/service.yaml b/charts/sms/templates/service.yaml
index 1ba8580..04e9a5a 100644
--- a/charts/sms/templates/service.yaml
+++ b/charts/sms/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.name }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.fullname" . }}
@@ -25,7 +25,7 @@
spec:
type: {{ .Values.service.type }}
ports:
- - name: {{ .Values.service.name }}
+ - name: {{ .Values.service.portName }}
{{if eq .Values.service.type "NodePort" -}}
port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
diff --git a/charts/sms/values.yaml b/charts/sms/values.yaml
index 0c537c5..05d4e79 100644
--- a/charts/sms/values.yaml
+++ b/charts/sms/values.yaml
@@ -69,6 +69,7 @@
service:
type: NodePort
name: aaf-sms
+ portName: aaf-sms
internalPort: 10443
nodePort: 43