Merge "dcae sec updates for dashboard and inventory"

diff --git a/kubernetes/aai b/kubernetes/aai
index 23f0764..ac0ea8a 160000 (submodule)
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit 23f076495d36081f34a367067918d15fcc5ada8d
+Subproject commit ac0ea8aa12226ac95683838e92d22928eb221630

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index 6435b0a..d6257bb 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@ -56,6 +56,8 @@ spec:
           - aaf-locate
           - --container-name
           - aaf-cm
+          - --container-name
+          - aaf-service
           env:
           - name: NAMESPACE
             valueFrom:

diff --git a/kubernetes/esr/charts/esr-gui/values.yaml b/kubernetes/esr/charts/esr-gui/values.yaml
index 952dd0a..a191739 100644 (file)
--- a/kubernetes/esr/charts/esr-gui/values.yaml
+++ b/kubernetes/esr/charts/esr-gui/values.yaml
@@ -26,7 +26,7 @@ global:
 repository: nexus3.onap.org:10001
 image: onap/aai/esr-gui:1.4.0
 pullPolicy: Always
-msbaddr: msb-iag.{{ include "common.namespace" . }}:80
+msbaddr: msb-iag.{{ include "common.namespace" . }}:443
 
 # default number of instances
 replicaCount: 1

diff --git a/kubernetes/esr/charts/esr-server/values.yaml b/kubernetes/esr/charts/esr-server/values.yaml
index 5316210..354e8e3 100644 (file)
--- a/kubernetes/esr/charts/esr-server/values.yaml
+++ b/kubernetes/esr/charts/esr-server/values.yaml
@@ -29,7 +29,7 @@ subChartsOnly:
 repository: nexus3.onap.org:10001
 image: onap/aai/esr-server:1.5.1
 pullPolicy: Always
-msbaddr: msb-iag.{{ include "common.namespace" . }}:80
+msbaddr: msb-iag.{{ include "common.namespace" . }}:443
 
 # application configuration
 config: