aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2022-04-11 22:47:26 +0000
committerGerrit Code Review <gerrit@onap.org>2022-04-11 22:47:26 +0000
commitd0157eff4bd792c544a33fcad86b572d3a48627a (patch)
treec58eebf3e869d771d3e06c69a4db4063fd371c3f
parentc80c2387c1980ac820c1df956aec38479276b3c7 (diff)
parent3684d47f120b5fdbdf163cede536334d37852181 (diff)
Merge "[DEPLOY] Use HELM_NS for kubectl commands"
-rwxr-xr-xkubernetes/helm/plugins/deploy/deploy.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 51438ad7ea..36853baa1f 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -67,6 +67,8 @@ generate_overrides() {
fi
done
}
+
+
resolve_deploy_flags() {
flags=($1)
n=${#flags[*]}
@@ -90,11 +92,11 @@ resolve_deploy_flags() {
check_for_dep() {
try=0
- retries=30
- until (kubectl get deployment -n $RELEASE | grep -P "\b$1\b") &>/dev/null; do
+ retries=60
+ until (kubectl get deployment -n $HELM_NAMESPACE | grep -P "\b$1\b") &>/dev/null; do
(( ++try > retries )) && exit 1
echo "$1 not found. Retry $try/$retries"
- sleep 5
+ sleep 10
done
echo "$1 found. Waiting for pod intialisation"
sleep 15
@@ -125,7 +127,7 @@ deploy_subchart() {
# Add annotation last-applied-configuration if set-last-applied flag is set
if [ "$SET_LAST_APPLIED" = "true" ]; then
helm get manifest "${RELEASE}-${subchart}" \
- | kubectl apply set-last-applied --create-annotation -n onap -f - \
+ | kubectl apply set-last-applied --create-annotation -n $HELM_NAMESPACE -f - \
> $LOG_FILE.log 2>&1
fi
fi
@@ -257,7 +259,7 @@ deploy() {
# Add annotation last-applied-configuration if set-last-applied flag is set
if [ "$SET_LAST_APPLIED" = "true" ]; then
helm get manifest ${RELEASE} \
- | kubectl apply set-last-applied --create-annotation -n onap -f - \
+ | kubectl apply set-last-applied --create-annotation -n $HELM_NAMESPACE -f - \
> $LOG_FILE.log 2>&1
fi
fi