Merge "DCAE updates for R4"

diff --combined kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index 8d525cb,be8fc16..2da7875
--- 1/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
--- 2/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@@ -21,6 -21,7 +21,7 @@@
  #################################################################
  global:
    nodePortPrefix: 302
+   nodePortPrefixExt: 304
    readinessRepository: oomk8s
    readinessImage: readiness-check:2.0.0
    loggingRepository: docker.elastic.co
@@@ -37,6 -38,9 +38,9 @@@ config
        host: consul-server
        port: 8500
      cm: dcae-cloudify-manager
+     dashboard:
+       port: 30418
+       portSecure: 30419
      datafile_collector:
        port: 30223
        portSecure: 30262
@@@ -46,8 -50,11 +50,11 @@@
      msb_iag: msb-iag
      policy_pdp: pdp
      sdc: sdc-be
+     snmptrap:
+       port: 30470
      ves:
        port: 30235
+       portSecure: 30417
    # redisCaching is a string not a boolean!
    redisCaching: "false"
  
@@@ -58,6 -65,7 +65,7 @@@ postgres
      name: dcae-postgres
      name2: dcae-pg-primary
      name3: dcae-pg-replica
+   suffix: svc.cluster.local
    container:
      name:
        primary: dcae-pg-primary
@@@ -81,13 -89,12 +89,13 @@@
  
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.9
 +image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.10-STAGING-latest
 +default_k8s_location: central
  
  # DCAE component images to be deployed via Cloudify Manager
  # Use to override default setting in blueprints
  componentImages:
-   datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.1
+   dashboard: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0-SNAPSHOT-latest
    holmes_rules: onap/holmes/rule-management:1.2.3
    holmes_engine: onap/holmes/engine-management:1.2.2
    tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0