Merge "[OOF] Update configuration for TN-FH in NxI termination app"

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 2afc1fd..c548abb 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -75,7 +75,7 @@ global:
     container:
       name: postgres
 
-image: onap/cps-and-ncmp:3.0.0
+image: onap/cps-and-ncmp:3.0.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 

diff --git a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index ddaf099..63d266b 100644 (file)
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 set -eo pipefail
-shopt -s nullglob
 
 # logging functions
 mysql_log() {
@@ -170,11 +169,20 @@ docker_init_database_dir() {
     mysql_note "Database files initialized"
 }
 
+if [ -z "$DATADIR" ]; then
+    DATADIR='unknown'
+fi
+if [ -z "$SOCKET" ]; then
+    SOCKET='unknown'
+fi
+if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
+    DATABASE_ALREADY_EXISTS='false'
+fi
+
 # Loads various settings that are used elsewhere in the script
 # This should be called after mysql_check_config, but before any other functions
 docker_setup_env() {
     # Get config
-    declare -g DATADIR SOCKET
     DATADIR="$(mysql_get_config 'datadir' "$@")"
     SOCKET="$(mysql_get_config 'socket' "$@")"
 
@@ -186,7 +194,6 @@ docker_setup_env() {
     file_env 'MYSQL_ROOT_PASSWORD'
     file_env 'PORTAL_DB_TABLES'
 
-    declare -g DATABASE_ALREADY_EXISTS
     if [ -d "$DATADIR/mysql" ]; then
         DATABASE_ALREADY_EXISTS='true'
     fi

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 5bd781e..d279163 100644 (file)
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -63,7 +63,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui-server:4.0.6
+image: onap/usecase-ui-server:4.0.7
 pullPolicy: Always
 
 # application configuration

diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 1ed9b47..f133ad5 100644 (file)
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -57,7 +57,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/usecase-ui:4.0.6
+image: onap/usecase-ui:4.0.7
 pullPolicy: Always
 
 # application configuration