From 87f294a3ff384c93d21b493296e135de3aa81f6d Mon Sep 17 00:00:00 2001
From: Thomas Runyon <thomas.runyon.2.ctr@us.af.mil>
Date: Fri, 16 Apr 2021 08:38:49 -0400
Subject: [PATCH] added back as kustomization, not values
---
scripts/deploy/01_deploy_bigbang.sh | 19 +++++++++----------
scripts/deploy/02_wait_for_helmreleases.sh | 4 ++--
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/scripts/deploy/01_deploy_bigbang.sh b/scripts/deploy/01_deploy_bigbang.sh
index 1b65f9379d..d06829ebd3 100755
--- a/scripts/deploy/01_deploy_bigbang.sh
+++ b/scripts/deploy/01_deploy_bigbang.sh
@@ -25,14 +25,13 @@ helm upgrade -i bigbang chart -n bigbang --create-namespace \
--set registryCredentials[0].username='robot$bigbang' \
--set registryCredentials[0].password="$REGISTRY1_PASSWORD" \
--set registryCredentials[0].registry=registry1.dso.mil \
- -f ${CI_VALUES_FILE} \
- -f chart/ingress-certs.yaml
+ -f ${CI_VALUES_FILE}
-# # apply secrets kustomization pointing to current branch
-# echo "Deploying secrets from the ${CI_COMMIT_REF_NAME} branch"
-# if [ -z "$CI_COMMIT_TAG" ]; then
-# cat tests/ci/shared-secrets.yaml | sed 's|master|'"$CI_COMMIT_REF_NAME"'|g' | kubectl apply -f -
-# else
-# # NOTE: $CI_COMMIT_REF_NAME = $CI_COMMIT_TAG when running on a tagged build
-# cat tests/ci/shared-secrets.yaml | sed 's|branch: master|tag: '"$CI_COMMIT_REF_NAME"'|g' | kubectl apply -f -
-# fi
\ No newline at end of file
+# apply secrets kustomization pointing to current branch
+echo "Deploying secrets from the ${CI_COMMIT_REF_NAME} branch"
+if [ -z "$CI_COMMIT_TAG" ]; then
+ cat tests/ci/shared-secrets.yaml | sed 's|master|'"$CI_COMMIT_REF_NAME"'|g' | kubectl apply -f -
+else
+ # NOTE: $CI_COMMIT_REF_NAME = $CI_COMMIT_TAG when running on a tagged build
+ cat tests/ci/shared-secrets.yaml | sed 's|branch: master|tag: '"$CI_COMMIT_REF_NAME"'|g' | kubectl apply -f -
+fi
\ No newline at end of file
diff --git a/scripts/deploy/02_wait_for_helmreleases.sh b/scripts/deploy/02_wait_for_helmreleases.sh
index 00d92801e1..8e554fbb8a 100755
--- a/scripts/deploy/02_wait_for_helmreleases.sh
+++ b/scripts/deploy/02_wait_for_helmreleases.sh
@@ -96,8 +96,8 @@ do
fi
done
-# echo "Waiting on Secrets Kustomization"
-# kubectl wait --for=condition=Ready --timeout 300s kustomizations.kustomize.toolkit.fluxcd.io -n bigbang secrets
+echo "Waiting on Secrets Kustomization"
+kubectl wait --for=condition=Ready --timeout 300s kustomizations.kustomize.toolkit.fluxcd.io -n bigbang secrets
# In case some helm releases are marked as ready before all objects are live...
echo "Waiting on all deployments, statefulsets, and daemonsets"
--
GitLab