summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------kubernetes/aai0
-rwxr-xr-xkubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh6
-rw-r--r--kubernetes/common/dgbuilder/resources/scripts/customSettings.js8
-rw-r--r--kubernetes/common/dgbuilder/values.yaml2
-rw-r--r--kubernetes/msb/charts/msb-discovery/values.yaml2
-rw-r--r--kubernetes/msb/charts/msb-eag/values.yaml2
-rw-r--r--kubernetes/msb/charts/msb-iag/values.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/values.yaml4
-rw-r--r--kubernetes/vfc/charts/vfc-catalog/values.yaml2
9 files changed, 20 insertions, 8 deletions
diff --git a/kubernetes/aai b/kubernetes/aai
-Subproject 9d23a1c8a97d5878e2aafc871f17af007349c28
+Subproject d68960684392a6da61805e4161ae032549db610
diff --git a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
index aaf7a2615c..b037058c2b 100755
--- a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
+++ b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
@@ -85,6 +85,12 @@ then
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 e3349b9d5a..66b7b5ed15 100644
--- a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
+++ b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
@@ -35,6 +35,11 @@ module.exports={
"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 @@ module.exports={
},
"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 df52fbc64b..fa205e227e 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -47,7 +47,7 @@ global:
#################################################################
# 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 bc279e0dcb..b47127865d 100644
--- a/kubernetes/msb/charts/msb-discovery/values.yaml
+++ b/kubernetes/msb/charts/msb-discovery/values.yaml
@@ -24,7 +24,7 @@ global:
#################################################################
# 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 e8b28ac2f2..e25fa28685 100644
--- a/kubernetes/msb/charts/msb-eag/values.yaml
+++ b/kubernetes/msb/charts/msb-eag/values.yaml
@@ -24,7 +24,7 @@ global:
#################################################################
# 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 6008cea479..4aaeaeadc3 100644
--- a/kubernetes/msb/charts/msb-iag/values.yaml
+++ b/kubernetes/msb/charts/msb-iag/values.yaml
@@ -24,7 +24,7 @@ global:
#################################################################
# 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 3b8e9bfc43..e7117d7e9f 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
@@ -26,8 +26,8 @@ global:
# 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
diff --git a/kubernetes/vfc/charts/vfc-catalog/values.yaml b/kubernetes/vfc/charts/vfc-catalog/values.yaml
index aea74c614b..1a8808b358 100644
--- a/kubernetes/vfc/charts/vfc-catalog/values.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/values.yaml
@@ -76,7 +76,7 @@ persistence:
## GKE, AWS & OpenStack)
##
# storageClass: "-"
- accessMode: ReadWriteMany
+ accessMode: ReadWriteOnce
size: 2Gi
mountPath: /dockerdata-nfs
mountSubPath: vfc/catalog