From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 21 Jun 2021 13:37:31 +0000 (+0000)
Subject: Merge "[AAI] Update truststore path to generated certificate location"
X-Git-Tag: 9.0.0~226
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2f48550414136d6b638d7c05307d17b5361c9757;hp=95b39b13853b40ec3ac4086780ac6ad09a2be3cc;p=oom.git

Merge "[AAI] Update truststore path to generated certificate location"
---

diff --git a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index 5b652228a6..64c7daacbf 100644
--- a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@ -11,7 +11,7 @@ fi
 if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
         find /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG" \
                 \! -user cassandra -exec chown cassandra '{}' +
-        exec gosu cassandra "$BASH_SOURCE" "$@"
+        exec gosu cassandra "$0" "$@"
 fi
 
 _ip_address() {
diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
index 67bbfd6c6f..163877deca 100755
--- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
+++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-#
+
 #   Copyright 2020 Samsung Electronics Co., Ltd.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,7 +70,8 @@ ingress_controller_ip() {
 
 deploy() {
 	local ingress_ip=$(ingress_controller_ip)
-	pushd "$SPATH/bind9dns" > /dev/null
+	initdir = $(pwd)
+	cd $SPATH/bind9dns
 	if [ $# -eq 0 ]; then
 		local cl_domain="simpledemo.onap.org"
 	else
@@ -82,7 +83,7 @@ deploy() {
 		shift
 	fi
 	helm install . --set dnsconf.wildcard="$cl_domain=$ingress_ip" $@
-	popd > /dev/null
+	cd $initdir
 	target_machine_notice_info
 }
 
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
index a1431488b8..83914d423c 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================
 # ================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -103,10 +103,10 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: 4000m
+      memory: 4Gi
     requests:
-      cpu: 1
+      cpu: 1500m
       memory: 1Gi
   large:
     limits:
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 c4a21b927f..ebc8ca0f40 100644
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@ -323,7 +323,7 @@ _main() {
 		# If container is started as root user, restart as dedicated mysql user
 		if [ "$(id -u)" = "0" ]; then
 			mysql_note "Switching to dedicated user 'mysql'"
-			exec gosu mysql "$BASH_SOURCE" "$@"
+			exec gosu mysql "$0" "$@"
 		fi
 
 		# there's no database, so it needs to be initialized
diff --git a/kubernetes/robot/instantiate-k8s.sh b/kubernetes/robot/instantiate-k8s.sh
index f4f6b04e4c..623870b9f3 100755
--- a/kubernetes/robot/instantiate-k8s.sh
+++ b/kubernetes/robot/instantiate-k8s.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # Copyright 2019 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+THIS_DIR="$( cd "$( dirname "$0" )" >/dev/null 2>&1 && pwd )"
 
 NAMESPACE=
 FOLDER=
@@ -138,13 +139,13 @@ kubectl --namespace $NAMESPACE cp ${POD}:share/logs/$OUTPUT_FOLDER/summary/stack
 kubectl --namespace $NAMESPACE cp ${POD}:share/logs/$OUTPUT_FOLDER/summary/results.json "$OUTPUT_DIRECTORY"/results.json
 kubectl --namespace $NAMESPACE cp ${POD}:share/logs/$OUTPUT_FOLDER/log.html "$OUTPUT_DIRECTORY"/log.html
 
-pushd .
+initdir=$(pwd)
 
 # echo -e "import hashlib\nwith open(\"README.md\", \"r\") as f: bytes = f.read()\nreadable_hash = hashlib.sha256(bytes).hexdigest()\nprint(readable_hash)" | python
 
 cd "$OUTPUT_DIRECTORY"
 tar -czvf vnf_heat_results.tar.gz *
 
-popd
+cd $initdir
 
 echo "VNF test results: $OUTPUT_DIRECTORY/vnf_heat_results.tar.gz"