From c9bd3a43289d02581f08ba8661cf56c6efcdf49e Mon Sep 17 00:00:00 2001 From: Devon Mackay Date: Mon, 24 Sep 2018 11:23:39 -0400 Subject: [PATCH] Only generat IMAGE_NAME if it is undefined --- deploy/kubernetes/atst-update-deploy.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deploy/kubernetes/atst-update-deploy.sh b/deploy/kubernetes/atst-update-deploy.sh index 937db112..75b3f6d6 100755 --- a/deploy/kubernetes/atst-update-deploy.sh +++ b/deploy/kubernetes/atst-update-deploy.sh @@ -11,6 +11,11 @@ set -o nounset # Config MAX_DEPLOY_WAIT='300' +if [ "${IMAGE_NAME}x" = "x" ] +then + IMAGE_NAME="${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${GIT_SHA}" +fi + # Remove the K8S CA file when the script exits function cleanup { printf "Cleaning up...\n" @@ -39,7 +44,7 @@ kubectl config use-context travis kubectl config current-context # Update the ATST deployment -kubectl -n atat set image deployment.apps/atst atst="${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${GIT_SHA}" +kubectl -n atat set image deployment.apps/atst atst="${IMAGE_NAME}" # Wait for deployment to finish if ! timeout -t "${MAX_DEPLOY_WAIT}" -s INT kubectl -n atat rollout status deployment/atst