Allow nodeport values to be changed

Allow nodeport values to be changed for ves and datafile collector

Change-Id: I6e837b91d9ee400a282c1fcb9ea38a12e1b42441
Issue-ID: DCAEGEN2-963
Signed-off-by: dgermain <daniel.germain@cgi.com>

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
index 09d0db0..f330e64 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
@@ -19,8 +19,8 @@
 {{ if .Values.componentImages.datafile_collector }}
 tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.datafile_collector }}
 {{ end }}
-host_port: 30223
-host_port_secure: 30262
+host_port: {{ .Values.config.address.datafile_collector.port }}
+host_port_secure: {{ .Values.config.address.datafile_collector.portSecure }}
 dmaap_mr_host: "{{ .Values.config.address.message_router }}"
 dmaap_mr_port: 3904
 dmaap_mr_user: "admin"

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
index 07231fe..078af0c 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
@@ -19,7 +19,7 @@
 {{ if .Values.componentImages.ves }}
 tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.ves }}
 {{ end }}
-external_port : "30235"
+external_port : {{ .Values.config.address.ves.port }}
 ves_other_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_OTHER_OUTPUT/"
 ves_heartbeat_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/"
 ves_fault_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT/"

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index e6264fa..d8ed347 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -35,12 +35,17 @@ config:
       host: consul-server
       port: 8500
     cm: dcae-cloudify-manager
+    datafile_collector:
+      port: 30223
+      portSecure: 30262
     dmaap_dr_prov: dmaap-dr-prov
     message_router: message-router
     msb_discovery: msb-discovery
     msb_iag: msb-iag
     policy_pdp: pdp
     sdc: sdc-be
+    ves:
+      port: 30235
   # redisCaching is a string not a boolean!
   redisCaching: "false"