NodePort Helm Parametrization

parameterization of node ports, and create/delete update to fix multi ONAP instances creation(in diff NS).
Issue-ID: OOM-52
Change-Id: Iaa3f5bc43f70b95cdc349389e25ef8b804a7a329
Signed-off-by: kerenj <keren.joseph@amdocs.com>

diff --git a/templates/all-services.yaml b/templates/all-services.yaml
index 2c0fbc4..22d94eb 100644 (file)
--- a/templates/all-services.yaml
+++ b/templates/all-services.yaml
@@ -25,11 +25,11 @@ spec:
   - name: "aai-service-port-8443"
     port: 8443
     targetPort: 8443
-    nodePort: 30233
+    nodePort: {{ .Values.nodePortPrefix }}33
   - name: "aai-service-port-8080"
     port: 8080
     targetPort: 8080
-    nodePort: 30232
+    nodePort: {{ .Values.nodePortPrefix }}32
   type: NodePort
   selector:
     app: aai-service
@@ -45,10 +45,10 @@ spec:
   ports:
   - name: "model-loader-service-port-8443"
     port: 8443
-    nodePort: 30229
+    nodePort: {{ .Values.nodePortPrefix }}29
   - name: "model-loader-service-port-8080"
     port: 8080
-    nodePort: 30210
+    nodePort: {{ .Values.nodePortPrefix }}10
   type: NodePort
   selector:
     app: model-loader-service

diff --git a/values.yaml b/values.yaml
index 3c6894c..d501d11 100644 (file)
--- a/values.yaml
+++ b/values.yaml
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   ajscAai: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest