From: Taka Cho <takamune.cho@att.com>
Date: Wed, 4 Sep 2019 19:38:31 +0000 (-0400)
Subject: expose 8282 port outside
X-Git-Tag: 5.0.1-ONAP~76^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3c29d5f19ade160a9a5b7856769d377d2d2b7fed;p=oom.git

expose 8282 port outside

8282 port is used for the url executor
in DG. Also external IP address is used
in DG. Hence has to be exposed to outside

Issue-ID: APPC-1712
Change-Id: I2cff6b514edf7dde76e9b73351678bdf7a3771e4
Signed-off-by: Taka Cho <takamune.cho@att.com>
---

diff --git a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
index 2192662d6a..fd29fbebfb 100644
--- a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
+++ b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
@@ -57,9 +57,9 @@ spec:
           env:
           # This sets the port that CDT will use to connect to the main appc container.
           # The 11 is the node port suffix that is used in the main appc oom templates
-          # for nodePort3. This value will be configured in appc main chart in appc-cdt section.
+          # for nodePort4. This value will be configured in appc main chart in appc-cdt section.
           - name: CDT_PORT
-            value: "{{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.nodePort3 }}"
+            value: "{{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.nodePort4 }}"
           volumeMounts:
           - mountPath: /etc/localtime
             name: localtime
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index fdd31a4ed0..a44214a611 100644
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -41,23 +41,31 @@ spec:
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: "{{ .Values.service.portName }}-8443"
+      name: "{{ .Values.service.portName }}-8282"
     - port: {{ .Values.service.externalPort2 }}
+      targetPort: {{ .Values.service.internalPort2 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      name: "{{ .Values.service.portName }}-1830"
+      name: "{{ .Values.service.portName }}-8443"
     - port: {{ .Values.service.externalPort3 }}
       targetPort: {{ .Values.service.internalPort3 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+      name: "{{ .Values.service.portName }}-1830"
+    - port: {{ .Values.service.externalPort4 }}
+      targetPort: {{ .Values.service.internalPort4 }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort4 }}
       name: "{{ .Values.service.portName }}-9090"
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}-8443
+      name: {{ .Values.service.portName }}-8282
     - port: {{ .Values.service.externalPort2 }}
       targetPort: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName }}-1830
+      name: {{ .Values.service.portName }}-8443
     - port: {{ .Values.service.externalPort3 }}
       targetPort: {{ .Values.service.internalPort3 }}
+      name: {{ .Values.service.portName }}-1830
+    - port: {{ .Values.service.externalPort4 }}
+      targetPort: {{ .Values.service.internalPort4 }}
       name: {{ .Values.service.portName }}-9090
     {{- end}}
   selector:
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 578dbc7453..cfd118dae6 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -93,9 +93,9 @@ dgbuilder:
   service:
     name: appc-dgbuilder
 
-#passing value to cdt chart. value of nodePort3 will be same as appc.service.nodePort3.
+#passing value to cdt chart. value of nodePort4 will be same as appc.service.nodePort4.
 appc-cdt:
-  nodePort3: 11
+  nodePort4: 11
 # default number of instances
 replicaCount: 1
 
@@ -119,19 +119,22 @@ service:
   type: NodePort
   name: appc
   portName: appc
-  #targetPort
-  internalPort: 8443
-  #port
-  externalPort: 8443
-  nodePort: 30
-
-  externalPort2: 1830
-  nodePort2: 31
+
+  internalPort: 8181
+  externalPort: 8282
+  nodePort: "08"
+
+  internalPort2: 8443
+  externalPort2: 8443
+  nodePort2: 30
+
+  externalPort3: 1830
+  nodePort3: 31
   clusterPort: 2550
 
-  internalPort3: 9191
-  externalPort3: 9090
-  nodePort3: 11
+  internalPort4: 9191
+  externalPort4: 9090
+  nodePort4: 11
 
 ## Persist data to a persitent volume
 persistence: