Change port mapping on DMaaP DR prov

Change-Id: I6467c37800ec96bd1b030f0576ce690d408ff5b6
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: INT-1296

4 files changed, 8 insertions, 9 deletions

diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json b/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
index 9099e046ed..23b111c8f3 100644
--- a/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
@@ -4,7 +4,7 @@
 {{- else -}}
   "dmaapName": "{{ include "common.namespace" . }}",
 {{- end}}
-  "drProvUrl": "https://dmaap-dr-prov:8443",
+  "drProvUrl": "https://dmaap-dr-prov",
   "version": "1",
   "topicNsRoot": "org.onap.dmaap",
   "bridgeAdminTopic": "DCAE_MM_AGENT"
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
index 52f1f3f5c0..210fb7c75f 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
@@ -23,8 +23,8 @@
 
 
 #Jetty Server properties
-org.onap.dmaap.datarouter.provserver.http.port           = {{.Values.global.dmaapDrProvExtPort}}
-org.onap.dmaap.datarouter.provserver.https.port          = {{.Values.global.dmaapDrProvExtPort2}}
+org.onap.dmaap.datarouter.provserver.http.port           = {{.Values.config.dmaapDrProv.internalPort}}
+org.onap.dmaap.datarouter.provserver.https.port          = {{.Values.config.dmaapDrProv.internalPort2}}
 org.onap.dmaap.datarouter.provserver.https.relaxation    = true
 
 org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index ea487d0571..98ad9a373e 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@ -50,18 +50,17 @@ spec:
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
-          - containerPort: {{ .Values.global.dmaapDrProvExtPort }}
-          - containerPort: {{ .Values.global.dmaapDrProvExtPort2 }}
+          - containerPort: {{ .Values.config.dmaapDrProv.internalPort }}
           {{- if eq .Values.liveness.enabled true }}
           livenessProbe:
             tcpSocket:
-              port: {{ .Values.global.dmaapDrProvExtPort }}
+              port: {{ .Values.config.dmaapDrProv.internalPort }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{ end -}}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.global.dmaapDrProvExtPort }}
+              port: {{ .Values.config.dmaapDrProv.internalPort }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 89c8baa1a4..86c2fe970c 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -35,8 +35,8 @@ global:
 
   #dmaap-dr-prov server configuration
   dmaapDrProvName: dmaap-dr-prov
-  dmaapDrProvExtPort2: 8443
-  dmaapDrProvExtPort: 8080
+  dmaapDrProvExtPort2: 443
+  dmaapDrProvExtPort: 80
 
 
 #Component overrides