commit cb0104475bbec5b233e37c1cdae05c84ce96beaa
author Alexis de Talhouët <adetalhouet89@gmail.com> Mon May 13 17:10:03 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Mon May 13 17:10:03 2019 +0000
tree 23c416985d4bc067a89c272ef860c97fc45f3b1b
parent 8f5004939a58a7a3d7c2398678a449a1767debe9
parent 178888312c51f0afdaa575650d3beede696637b5

Merge "Adding NodePorts to dmaap-dr-node"

kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
index b720701..c935ce4 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
@@ -30,11 +30,11 @@
     {{if eq .Values.config.dmaapDrNode.servicetype "NodePort" -}}
     - port: {{.Values.config.dmaapDrNode.externalPort}}
       targetPort: {{.Values.config.dmaapDrNode.internalPort}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{.Values.config.dmaapDrNode.nodePort}}
+      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{.Values.config.dmaapDrNode.nodePort}}
       name: {{.Values.config.dmaapDrNode.name}}
     - port: {{.Values.config.dmaapDrNode.externalPort2}}
       targetPort: {{.Values.config.dmaapDrNode.internalPort2}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{.Values.config.dmaapDrNode.nodePort2}}
+      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{.Values.config.dmaapDrNode.nodePort2}}
       name: {{.Values.config.dmaapDrNode.name}}2
     {{- else -}}
     - port: {{.Values.config.dmaapDrNode.externalPort}}

kubernetes/dmaap/components/dmaap-dr-node/values.yaml

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 3b1532f..154018a 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -16,6 +16,7 @@
 # Global configuration defaults.
 #################################################################
 global:
+  nodePortPrefixExt: 304
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.0
   loggingRepository: docker.elastic.co
@@ -96,7 +97,7 @@
 config:
   # dr node server configuration
   dmaapDrNode:
-    servicetype: ClusterIP
+    servicetype: NodePort
     name: dmaap-dr-node
     externalPort: 8080
     externalPort2: 8443
@@ -104,6 +105,8 @@
     internalPort2: 8443
     portName: dr-node-port
     portName2: dr-node-port2
+    nodePort: 93
+    nodePort2: 94
 
 # dr provisioning server configuration
   dmaapDrProv: