aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/common
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2021-01-21 13:23:35 +0000
committerGerrit Code Review <gerrit@onap.org>2021-01-21 13:23:35 +0000
commit8ab4fba7165b3b9418730cb1cdd424346925a93f (patch)
treeab6a3d7ca06ba168db18c8f6214600403f02571c /kubernetes/common
parent0e6972b5a5f94d76848a22f5155f49925522b324 (diff)
parent36389674b8b95079a7c0c989a4909780eded889e (diff)
Merge "[COMMON][CERTS] Use sh to onboard custom certs"
Diffstat (limited to 'kubernetes/common')
-rwxr-xr-xkubernetes/common/cert-wrapper/resources/import-custom-certs.sh18
-rw-r--r--kubernetes/common/certInitializer/templates/_certInitializer.yaml2
2 files changed, 13 insertions, 7 deletions
diff --git a/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh b/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
index 7e2fa91363..87e584c78e 100755
--- a/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
+++ b/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
@@ -26,14 +26,20 @@ mkdir -p $WORK_DIR
# Decrypt and move relevant files to WORK_DIR
for f in $CERTS_DIR/*; do
- if [[ $AAF_ENABLED == false ]] && [[ $f == *$ONAP_TRUSTSTORE* ]]; then
+ export canonical_name_nob64=$(echo $f | sed 's/.*\/\([^\/]*\)/\1/')
+ export canonical_name_b64=$(echo $f | sed 's/.*\/\([^\/]*\)\(\.b64\)/\1/')
+ if [ "$AAF_ENABLED" == "false" ] && [ "$canonical_name_b64" == "$ONAP_TRUSTSTORE" ]; then
# Dont use onap truststore when aaf is disabled
continue
fi
- if [[ $f == *.sh ]]; then
+ if [ "$AAF_ENABLED" == "false" ] && [ "$canonical_name_nob64" == "$ONAP_TRUSTSTORE" ]; then
+ # Dont use onap truststore when aaf is disabled
+ continue
+ fi
+ if [ ${f: -3} == ".sh" ]; then
continue
fi
- if [[ $f == *.b64 ]]
+ if [ ${f: -4} == ".b64" ]
then
base64 -d $f > $WORK_DIR/`basename $f .b64`
else
@@ -42,7 +48,7 @@ for f in $CERTS_DIR/*; do
done
# Prepare truststore output file
-if [[ $AAF_ENABLED == true ]]
+if [ "$AAF_ENABLED" == "true" ]
then
mv $WORK_DIR/$ONAP_TRUSTSTORE $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME
else
@@ -52,10 +58,10 @@ fi
# Import Custom Certificates
for f in $WORK_DIR/*; do
- if [[ $f == *.pem ]]; then
+ if [ ${f: -4} == ".pem" ]; then
echo "importing certificate: $f"
keytool -import -file $f -alias `basename $f` -keystore $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME -storepass $TRUSTSTORE_PASSWORD -noprompt
- if [[ $? != 0 ]]; then
+ if [ $? != 0 ]; then
echo "failed importing certificate: $f"
exit 1
fi
diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
index c1459bf438..5a8e84cd8c 100644
--- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml
+++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
@@ -121,7 +121,7 @@
securityContext:
runAsUser: 0
command:
- - /bin/bash
+ - /bin/sh
- -c
- /root/import-custom-certs.sh
env: