Make all services independent of helm Release.Name

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

15 files changed, 26 insertions, 24 deletions

diff --git a/charts/aai-babel/templates/service.yaml b/charts/aai-babel/templates/service.yaml
index 93b0fd1..745c73b 100644
--- a/charts/aai-babel/templates/service.yaml
+++ b/charts/aai-babel/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 @@ 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 }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/charts/aai-babel/values.yaml b/charts/aai-babel/values.yaml
index bb1479b..43f8952 100644
--- a/charts/aai-babel/values.yaml
+++ b/charts/aai-babel/values.yaml
@@ -53,6 +53,7 @@ readiness:
 service:
   type: NodePort
   name: babel
+  portName: babel
   externalPort: 79
   internalPort: 9516
   nodePort: 79
diff --git a/charts/aai-cassandra/templates/service.yaml b/charts/aai-cassandra/templates/service.yaml
index a4557fe..c49e605 100644
--- a/charts/aai-cassandra/templates/service.yaml
+++ b/charts/aai-cassandra/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "common.fullname" . }}
+  name: {{ template "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ template "common.fullname" . }}
diff --git a/charts/aai-champ/templates/service.yaml b/charts/aai-champ/templates/service.yaml
index 93b0fd1..745c73b 100644
--- a/charts/aai-champ/templates/service.yaml
+++ b/charts/aai-champ/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 @@ 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 }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/charts/aai-champ/values.yaml b/charts/aai-champ/values.yaml
index 28f28d4..7849418 100644
--- a/charts/aai-champ/values.yaml
+++ b/charts/aai-champ/values.yaml
@@ -53,6 +53,7 @@ readiness:
 service:
   type: NodePort
   name: champ
+  portName: champ
   internalPort: 9522
   nodePort: 78
 
diff --git a/charts/aai-data-router/resources/dynamic/routes/entity-event.route b/charts/aai-data-router/resources/dynamic/routes/entity-event.route
index 7b4e902..eb93b26 100644
--- a/charts/aai-data-router/resources/dynamic/routes/entity-event.route
+++ b/charts/aai-data-router/resources/dynamic/routes/entity-event.route
@@ -1,4 +1,4 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://dmaap.{{.Release.Namespace}}:3904"/>
+  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://message-router.{{.Release.Namespace}}:3904"/>
   <to uri="bean:entityEventPolicy?method=process"/>
 </route>
diff --git a/charts/aai-elasticsearch/templates/service.yaml b/charts/aai-elasticsearch/templates/service.yaml
index 84548ed..54ee8b6 100644
--- a/charts/aai-elasticsearch/templates/service.yaml
+++ b/charts/aai-elasticsearch/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.name" . }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -14,10 +14,10 @@ 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 }}
     {{- else -}}
     - port: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: {{ .Values.service.portName }}
     {{- end}}
   selector:
     app: {{ include "common.fullname" . }}
diff --git a/charts/aai-elasticsearch/values.yaml b/charts/aai-elasticsearch/values.yaml
index af7fd3d..e11326a 100644
--- a/charts/aai-elasticsearch/values.yaml
+++ b/charts/aai-elasticsearch/values.yaml
@@ -37,6 +37,7 @@ readiness:
 service:
   type: ClusterIP
   name: aai-elasticsearch
+  portName: aai-elasticsearch
   internalPort: 9200
 
 ingress:
diff --git a/charts/aai-gizmo/resources/config/crud-beans.xml b/charts/aai-gizmo/resources/config/crud-beans.xml
index a6cac62..7adc447 100644
--- a/charts/aai-gizmo/resources/config/crud-beans.xml
+++ b/charts/aai-gizmo/resources/config/crud-beans.xml
@@ -9,7 +9,7 @@
                 ">
 
      <bean id="champDao" class="org.onap.crud.dao.champ.ChampDao">
-         <constructor-arg name="champUrl" value="https://{{.Release.Name}}-aai-champ.{{.Release.Namespace}}:9522/services/champ-service/v1/"/>
+         <constructor-arg name="champUrl" value="https://aai-champ.{{.Release.Namespace}}:9522/services/champ-service/v1/"/>
          <constructor-arg name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10"/>
      </bean>
 
diff --git a/charts/aai-gizmo/templates/service.yaml b/charts/aai-gizmo/templates/service.yaml
index f88a4e9..b48a56c 100644
--- a/charts/aai-gizmo/templates/service.yaml
+++ b/charts/aai-gizmo/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" . }}
@@ -29,12 +29,12 @@ spec:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .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" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/charts/aai-gizmo/values.yaml b/charts/aai-gizmo/values.yaml
index de84285..f6119bd 100644
--- a/charts/aai-gizmo/values.yaml
+++ b/charts/aai-gizmo/values.yaml
@@ -51,10 +51,11 @@ readiness:
 service:
   type: NodePort
   name: crud-service
+  portName: crud-service
   internalPort: 9520
   nodePort: 66
 
 ingress:
   enabled: false
 
-resources: {}
\ No newline at end of file
+resources: {}
diff --git a/charts/aai-resources/resources/config/janusgraph-cached.properties b/charts/aai-resources/resources/config/janusgraph-cached.properties
index dd5c3ee..7e94ae4 100644
--- a/charts/aai-resources/resources/config/janusgraph-cached.properties
+++ b/charts/aai-resources/resources/config/janusgraph-cached.properties
@@ -24,11 +24,10 @@ query.fast-property=true
 query.smart-limit=false
 
 {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}}
-{{- $global := . }}
 
 # the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=cassandra
-storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}
+storage.hostname={{- range $i, $e := until $seed_size }}aai-cassandra-{{ $i }},{{- end }}
 
 storage.cassandra.keyspace=aaigraph
 
diff --git a/charts/aai-traversal/resources/config/application.properties b/charts/aai-traversal/resources/config/application.properties
index 14c59d2..ebfe98b 100644
--- a/charts/aai-traversal/resources/config/application.properties
+++ b/charts/aai-traversal/resources/config/application.properties
@@ -44,7 +44,7 @@ server.ssl.key-store-type=JKS
 # JMS bind address host port
 jms.bind.address=tcp://localhost:61647
 dmaap.ribbon.eureka.enabled=false
-dmaap.ribbon.listOfServers=dmaap.{{ include "common.namespace" . }}:3904
+dmaap.ribbon.listOfServers=message-router.{{ include "common.namespace" . }}:3904
 # Number of milliseconds to wait before making ping requests again
 dmaap.ribbon.ServerListRefreshInterval=75000
 dmaap.ribbon.NFLoadBalancerPingInterval=75000
diff --git a/charts/aai-traversal/resources/config/janusgraph-cached.properties b/charts/aai-traversal/resources/config/janusgraph-cached.properties
index dd5c3ee..7e94ae4 100644
--- a/charts/aai-traversal/resources/config/janusgraph-cached.properties
+++ b/charts/aai-traversal/resources/config/janusgraph-cached.properties
@@ -24,11 +24,10 @@ query.fast-property=true
 query.smart-limit=false
 
 {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}}
-{{- $global := . }}
 
 # the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=cassandra
-storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}
+storage.hostname={{- range $i, $e := until $seed_size }}aai-cassandra-{{ $i }},{{- end }}
 
 storage.cassandra.keyspace=aaigraph
 
diff --git a/resources/config/aai-data/environments/simpledemo.json b/resources/config/aai-data/environments/simpledemo.json
index 9795975..598a3ba 100644
--- a/resources/config/aai-data/environments/simpledemo.json
+++ b/resources/config/aai-data/environments/simpledemo.json
@@ -42,7 +42,7 @@
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"APPLICATION_SERVERS": "aai.{{.Release.Namespace}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Release.Namespace}}:3904",
+		"AAI_DMAAP_HOST_PORT": "message-router.{{.Release.Namespace}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
@@ -94,7 +94,7 @@
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"APPLICATION_SERVERS": "aai.{{.Release.Namespace}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Release.Namespace}}:3904",
+		"AAI_DMAAP_HOST_PORT": "message-router.{{.Release.Namespace}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",