E2T: Multi e2term instances

Enable running multiple e2term instances

Issue-ID: RIC-577
Signed-off-by: Fuss, Areli (af732p) <areli.fuss@intl.att.com>
Change-Id: I4009febd4f0652ba0ebe487d53659d17b182dad6

diff --git a/helm/e2term/templates/deployment.yaml b/helm/e2term/templates/deployment.yaml
index 1f4e149..b2aae0f 100644 (file)
--- a/helm/e2term/templates/deployment.yaml
+++ b/helm/e2term/templates/deployment.yaml
@@ -29,7 +29,7 @@ metadata:
   name: {{ include "common.deploymentname.e2term" $topCtx }}-{{ $key }}
   namespace: {{ include "common.namespace.platform" $topCtx }}
   labels:
-    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
     chart: {{ $topCtx.Chart.Name }}-{{ $topCtx.Chart.Version | replace "+" "_" }}
     release: {{ $topCtx.Release.Name }}
     heritage: {{ $topCtx.Release.Service }}
@@ -37,7 +37,7 @@ spec:
   replicas: {{ .replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
       release: {{ $topCtx.Release.Name }}
   template:
     metadata:
@@ -91,7 +91,7 @@ spec:
           {{- end }}
         {{- end }}
       labels:
-        app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+        app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
         release: {{ $topCtx.Release.Name }}
     spec:
       hostname: {{ include "common.name.e2term" $topCtx }}-{{ $key }}
@@ -131,7 +131,7 @@ spec:
               containerPort: {{ include "common.serviceport.e2term.rmr.route" $topCtx }}
             - name: "rmrdata-{{ $key }}"
               containerPort: {{ include "common.serviceport.e2term.rmr.data" $topCtx }}
-            - name: "rmrsctp-{{ $key }}" 
+            - name: "sctp-{{ $key }}"
               containerPort: 36422
               protocol: SCTP 
           stdin: true

diff --git a/helm/e2term/templates/service-rmr.yaml b/helm/e2term/templates/service-rmr.yaml
index a708dfb..707856c 100644 (file)
--- a/helm/e2term/templates/service-rmr.yaml
+++ b/helm/e2term/templates/service-rmr.yaml
@@ -25,7 +25,7 @@ metadata:
   name: {{ include "common.servicename.e2term.rmr" $topCtx }}-{{ $key }}
   namespace: {{ include "common.namespace.platform" $topCtx }}
   labels:
-    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
     chart: {{ $topCtx.Chart.Name }}-{{ $topCtx.Chart.Version | replace "+" "_" }}
     release: {{ $topCtx.Release.Name }}
     heritage: {{ $topCtx.Release.Service }} 
@@ -41,7 +41,7 @@ spec:
       targetPort: "rmrdata-{{ $key }}"
       name: "rmrdata-{{ $key }}"
   selector:
-      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
       release: {{ $topCtx.Release.Name }}
 {{- end }}
 {{- end }}

diff --git a/helm/e2term/templates/service-sctp.yaml b/helm/e2term/templates/service-sctp.yaml
index b239fbc..d67ca22 100644 (file)
--- a/helm/e2term/templates/service-sctp.yaml
+++ b/helm/e2term/templates/service-sctp.yaml
@@ -25,7 +25,7 @@ metadata:
   name: {{ include "common.servicename.e2term.sctp" $topCtx }}-{{ $key }} 
   namespace: {{ include "common.namespace.platform" $topCtx }}
   labels:
-    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
     chart: {{ $topCtx.Chart.Name }}-{{ $topCtx.Chart.Version | replace "+" "_" }}
     release: {{ $topCtx.Release.Name }}
     heritage: {{ $topCtx.Release.Service }} 
@@ -36,9 +36,9 @@ spec:
       nodePort: {{ add 32222 $index }}
       protocol: "SCTP"
       targetPort: {{ include "common.serviceport.e2term.sctp" $topCtx }}
-      name: "rmrsctp-{{ $key }}"      
+      name: "sctp-{{ $key }}"
   selector:
-      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
       release: {{ $topCtx.Release.Name }}
 {{- end }}
 {{- end }}