From 5cfdfc823f4529d19d03d8e08cb2f3f1522aebdf Mon Sep 17 00:00:00 2001 From: Ian Howell Date: Wed, 1 Sep 2021 14:11:56 -0500 Subject: [PATCH] Prevent 22_test_configs.sh from deleting too much This states explicitly which files should be removed by 22_test_configs.sh as opposed to wiping out anything containing the string "config". This prevents the script from deleting files it shouldn't, e.g. config.bak Change-Id: I1d7b3563c3b5088b496b79f6416fd1d50ce6a600 --- tools/deployment/22_test_configs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 2c074987b..52064b71f 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -50,8 +50,8 @@ export AIRSHIP_CONFIG_MANIFEST_REPO_AUTH_TYPE=${AIRSHIP_CONFIG_MANIFEST_REPO_AUT export EXTERNAL_KUBECONFIG=${EXTERNAL_KUBECONFIG:-""} # Remove the contents of the .airship folder, preserving the kustomize plugin directory -rm -rf $HOME/.airship/*config* -mkdir -p $HOME/.airship +rm -rf "$HOME/.airship/config" "$HOME/.airship/kubeconfig" +mkdir -p "$HOME/.airship" echo "Generate ~/.airship/config and ~/.airship/kubeconfig" envsubst <"${AIRSHIPCTL_WS}/tools/deployment/templates/airshipconfig_template" > ~/.airship/config