diff options
10 files changed, 18 insertions, 12 deletions
diff --git a/kubernetes/aai b/kubernetes/aai -Subproject e67a94e6be333271c8237d6ebd5fb0f48940135 +Subproject 1bf85714ca747f446b003467754d5a3ea5b8adb 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 096b51c094..92349b8bf2 100644 --- 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 8a2cf692b8..e411b2b4e7 100644 --- 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 6d246de87f..b6f75d57cd 100644 --- 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 333a3e3f6d..d5b7bffefe 100644 --- 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/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml index 4623738003..aa8951c083 100644 --- 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 e6d7d11360..f040d10217 100644 --- 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 b61c84a494..be5d8aeeee 100644 --- 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 7cf7b306ad..62e095db1c 100644 --- 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 0370bbc71d..98b6e3bb01 100644 --- 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 }}' |