Merge "change accessMode for oom"
diff --git a/kubernetes/aai b/kubernetes/aai
index 9d23a1c..d689606 160000
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit 9d23a1c8a97d5878e2aafc871f17af007349c288
+Subproject commit d68960684392a6da61805e4161ae032549db6102
diff --git a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
index aaf7a26..b037058 100755
--- a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
+++ b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
@@ -85,6 +85,12 @@
echo " 'dbUser': '$dbUser'," >>$customSettingsFile
echo " 'dbPassword': '$dbPassword'," >>$customSettingsFile
echo " 'gitLocalRepository': '$gitLocalRepository'" >>$customSettingsFile
+ echo " 'restConfUrl': '$restConfUrl'," >>$customSettingsFile
+ echo " 'restConfUser': '$restConfUser'," >>$customSettingsFile
+ echo " 'restConfPassword': '$restConfPassword'," >>$customSettingsFile
+ echo " 'formatXML': '$formatXML'," >>$customSettingsFile
+ echo " 'formatJSON': '$formatJSON'," >>$customSettingsFile
+ echo " 'enableHttps': true" >>$customSettingsFile
echo " }" >>$customSettingsFile
fi
#echo "Created custom settings file $customSettingsFile"
diff --git a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
index e3349b9..66b7b5e 100644
--- a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
+++ b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
@@ -35,6 +35,11 @@
"dbUser": "sdnctl",
"dbPassword": "{{.Values.config.dbSdnctlPassword}}",
"gitLocalRepository": "",
+ "restConfUrl": "http://localhost:8181/restconf/operations/SLI-API:execute-graph",
+ "restConfUser": "admin",
+ "restConfPassword": "admin",
+ "formatXML": "Y",
+ "formatJSON": "Y",
"httpRoot": "/",
"disableEditor": false,
"httpAdminRoot": "/",
@@ -49,5 +54,6 @@
},
"uiHost": "0.0.0.0",
"version": "0.9.1",
- "performGitPull": "N"
+ "performGitPull": "N",
+ "enableHttps" : true
}
diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index df52fbc..fa205e2 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -47,7 +47,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/ccsdk-dgbuilder-image:0.6.0
+image: onap/ccsdk-dgbuilder-image:0.6.3
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/charts/msb-discovery/values.yaml
index bc279e0..b471278 100644
--- a/kubernetes/msb/charts/msb-discovery/values.yaml
+++ b/kubernetes/msb/charts/msb-discovery/values.yaml
@@ -24,7 +24,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/msb/msb_discovery:1.2.3
+image: onap/msb/msb_discovery:1.2.5
pullPolicy: Always
istioSidecar: true
diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/charts/msb-eag/values.yaml
index e8b28ac..e25fa28 100644
--- a/kubernetes/msb/charts/msb-eag/values.yaml
+++ b/kubernetes/msb/charts/msb-eag/values.yaml
@@ -24,7 +24,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/msb/msb_apigateway:1.2.4
+image: onap/msb/msb_apigateway:1.2.5
pullPolicy: Always
istioSidecar: true
diff --git a/kubernetes/msb/charts/msb-iag/values.yaml b/kubernetes/msb/charts/msb-iag/values.yaml
index 6008cea..4aaeaea 100644
--- a/kubernetes/msb/charts/msb-iag/values.yaml
+++ b/kubernetes/msb/charts/msb-iag/values.yaml
@@ -24,7 +24,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/msb/msb_apigateway:1.2.4
+image: onap/msb/msb_apigateway:1.2.5
pullPolicy: Always
istioSidecar: true
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
index 3b8e9bf..e7117d7 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
@@ -26,8 +26,8 @@
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
-image: onap/multicloud/k8s:0.4.0
+repository: registry.hub.docker.com
+image: onap/multicloud-k8s:0.5.0
pullPolicy: Always
# flag to enable debugging - application support required