From: Taka Cho <takamune.cho@att.com>
Date: Fri, 13 Mar 2020 19:42:34 +0000 (-0400)
Subject: remove 30208 port
X-Git-Tag: 6.0.0~293^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=96a53f7770032c81bc0dc689cb651537ea07a16f;p=oom.git

remove 30208 port

the port 30208 was using http apidoc
since we have moved to https apidoc
hence this 30208 can be removed

Issue-ID: APPC-1851
Change-Id: Iccd814bd624635939c51147489af708320caedac
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 d47c278e15..2879964392 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 nodePort4. This value will be configured in appc main chart in appc-cdt section.
+          # for nodePort3. This value will be configured in appc main chart in appc-cdt section.
           - name: CDT_PORT
-            value: "{{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.nodePort4 }}"
+            value: "{{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.nodePort3 }}"
           volumeMounts:
           - mountPath: /etc/localtime
             name: localtime
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index 98b2c79631..bd181e1e57 100644
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -41,31 +41,24 @@ spec:
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: "{{ .Values.service.portName }}-8282"
+      name: "{{ .Values.service.portName }}-8443"
     - port: {{ .Values.service.externalPort2 }}
       targetPort: {{ .Values.service.internalPort2 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      name: "{{ .Values.service.portName }}-8443"
+      name: "{{ .Values.service.portName }}-1830"
     - 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 }}-8282
+      name: {{ .Values.service.portName }}-8443
     - port: {{ .Values.service.externalPort2 }}
       targetPort: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName }}-8443
+      name: {{ .Values.service.portName }}-1830
     - 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 fd6e31f133..8e8c4219ac 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -138,9 +138,9 @@ dgbuilder:
   service:
     name: appc-dgbuilder
 
-#passing value to cdt chart. value of nodePort4 will be same as appc.service.nodePort4.
+#passing value to cdt chart. value of nodePort3 will be same as appc.service.nodePort3.
 appc-cdt:
-  nodePort4: 11
+  nodePort3: 11
 # default number of instances
 replicaCount: 1
 
@@ -165,21 +165,17 @@ service:
   name: appc
   portName: appc
 
-  internalPort: 8181
-  externalPort: 8282
-  nodePort: "08"
+  internalPort: 8443
+  externalPort: 8443
+  nodePort: 30
 
-  internalPort2: 8443
-  externalPort2: 8443
-  nodePort2: 30
-
-  externalPort3: 1830
-  nodePort3: 31
+  externalPort2: 1830
+  nodePort2: 31
   clusterPort: 2550
 
-  internalPort4: 9191
-  externalPort4: 9090
-  nodePort4: 11
+  internalPort3: 9191
+  externalPort3: 9090
+  nodePort3: 11
 
 ## Persist data to a persitent volume
 persistence: