Merge "Disable external ports and update versions"

diff --git a/kubernetes/aai b/kubernetes/aai
index e67a94e..1bf8571 160000 (submodule)
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit e67a94e6be333271c8237d6ebd5fb0f489401350
+Subproject commit 1bf85714ca747f446b003467754d5a3ea5b8adbe

diff --git a/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml b/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml
index c02eac2..9d03025 100644 (file)
--- a/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml
@@ -15,6 +15,6 @@ listenerservice:
     activateServerTLSAuth : false
     isUseHttpsWithDmaap: false
     archivePath: /opt/app/onap/sdc-listener/
-    grpcAddress: cds-blueprints-processor
+    grpcAddress: cds-blueprints-processor-grpc
     grpcPort: 9111
     authHeader: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
\ No newline at end of file

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index 096b51c..92349b8 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "60"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
 

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
index 8a2cf69..e411b2b 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "30"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
 

diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index 6d246de..b6f75d5 100644 (file)
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "30"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
         volumeMounts:

diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 333a3e3..d5b7bff 100644 (file)
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -25,7 +25,7 @@ global:
   clientImage: onap/dmaap/dbc-client:1.0.9
 
 #Global DMaaP app config
-  allow_http: false
+  allow_http: true
 
 # application configuration
 config:

diff --git a/kubernetes/multicloud/charts/multicloud-azure/values.yaml b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
index 99e5a6a..88746af 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-azure/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
@@ -57,7 +57,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   portName: multicloud-azure
   externalPort: 9008
   internalPort: 9008

diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
index e856e12..77b30bc 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
@@ -56,7 +56,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-fcaps
   portName: multicloud-fcaps
   externalPort: 9011

diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
index ff4b44b..38f7c74 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
@@ -40,7 +40,7 @@ config:
     password: AAI
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-thinkcloud
   portName: multicloud-thinkcloud
   externalPort: 9010

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
index de77ed0..85b8b4d 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
@@ -57,7 +57,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-ocata
   portName: multicloud-ocata
   externalPort: 9006

diff --git a/kubernetes/multicloud/charts/multicloud-pike/values.yaml b/kubernetes/multicloud/charts/multicloud-pike/values.yaml
index 4241887..7e2cfd4 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/values.yaml
@@ -56,7 +56,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-pike
   portName: multicloud-pike
   externalPort: 9007

diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
index 32dcb8f..05e7f01 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
@@ -56,7 +56,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-starlingx
   portName: multicloud-starlingx
   externalPort: 9009

diff --git a/kubernetes/multicloud/charts/multicloud-vio/values.yaml b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
index 0da23dd..f44ab0b 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
@@ -57,7 +57,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-vio
   portName: multicloud-vio
   externalPort: 9004

diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index 4b8b763..3c741fb 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -41,7 +41,7 @@ config:
     password: AAI
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-titaniumcloud
   portName: multicloud-titaniumcloud
   externalPort: 9005

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 889c06b..fdb4d9b 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -64,7 +64,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud
   portName: multicloud-framework
   externalPort: 9001

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 9f50620..08ba011 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -28,7 +28,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:3.0.2
+image: onap/externalapi/nbi:4.0.0
 pullPolicy: Always
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==

diff --git a/kubernetes/oof/charts/oof-has/values.yaml b/kubernetes/oof/charts/oof-has/values.yaml
index 69e24c7..8bc3e17 100755 (executable)
--- a/kubernetes/oof/charts/oof-has/values.yaml
+++ b/kubernetes/oof/charts/oof-has/values.yaml
@@ -25,7 +25,7 @@ global:
   commonConfigPrefix: onap-oof-has
   image:
     readiness: oomk8s/readiness-check:2.0.0
-    optf_has: onap/optf-has:1.3.0-SNAPSHOT-latest
+    optf_has: onap/optf-has:1.3.0
     filebeat: docker.elastic.co/beats/filebeat:5.5.0
 
 pullPolicy: Always

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 5099091..bf87f0f 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -26,7 +26,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-osdf:1.3.0-SNAPSHOT-latest
+image: onap/optf-osdf:1.3.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 4623738..aa8951c 100644 (file)
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-app:2.5.0-STAGING-latest
+image: onap/portal-app:2.5.0
 pullPolicy: Always
 
 # default number of instances

diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index e6d7d11..f040d10 100644 (file)
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -24,7 +24,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-db:2.5.0-STAGING-latest
+image: onap/portal-db:2.5.0
 pullPolicy: Always
 
 readinessImage: readiness-check:2.0.0

diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index b61c84a..be5d8ae 100644 (file)
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-sdk:2.5.0-STAGING-latest
+image: onap/portal-sdk:2.5.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml
index 7cf7b30..62e095d 100644 (file)
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@ -29,7 +29,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-wms:2.5.0-STAGING-latest
+image: onap/portal-wms:2.5.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 0370bbc..98b6e3b 100644 (file)
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -54,13 +54,13 @@ GLOBAL_DCAE_PASSWORD = '{{ .Values.dcaePassword}}'
 GLOBAL_DCAE_HVVES_SERVER_NAME = 'dcae-hv-ves-collector.{{include "common.namespace" .}}'
 GLOBAL_DCAE_HVVES_SERVER_PORT = "6061"
 # data router info - everything is from the private oam network (also called onap private network)
-GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "http"
-GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8080"
-GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http"
-GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080"
+GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "https"
+GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8443"
+GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "https"
+GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8443"
 # dmaap message router info
 GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME = 'message-router.{{include "common.namespace" .}}'
-GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT = "3904"
+GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT = "3905"
 # dmaap kafka info
 GLOBAL_DMAAP_KAFKA_SERVER_NAME = 'message-router-kafka.{{include "common.namespace" .}}'
 GLOBAL_DMAAP_KAFKA_SERVER_PORT = "9092"
@@ -93,8 +93,8 @@ GLOBAL_POMBA_CONTEXTAGGREGATOR_PORT = "9529"
 GLOBAL_MSB_SERVER_PROTOCOL = "http"
 GLOBAL_MSB_SERVER_PORT = "80"
 # message router info - everything is from the private oam network (also called onap private network)
-GLOBAL_MR_SERVER_PROTOCOL = "http"
-GLOBAL_MR_SERVER_PORT = "3904"
+GLOBAL_MR_SERVER_PROTOCOL = "https"
+GLOBAL_MR_SERVER_PORT = "3905"
 # bus controller info
 GLOBAL_BC_HTTPS_SERVER_PORT = "8443"
 GLOBAL_BC_USERNAME = '{{ .Values.bcUsername }}'