Use HELM_NAMESPACE instead of RELEASE for kubectl
Increase timeout for strimzi deploy
Issue-ID: OOM-2959
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ie6d09ade07f2f229972cfa8059f58312b9d6ee20
resolve_deploy_flags() {
flags=($1)
n=${#flags[*]}
resolve_deploy_flags() {
flags=($1)
n=${#flags[*]}
- 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"
(( ++try > retries )) && exit 1
echo "$1 not found. Retry $try/$retries"
done
echo "$1 found. Waiting for pod intialisation"
sleep 15
done
echo "$1 found. Waiting for pod intialisation"
sleep 15
# Add annotation last-applied-configuration if set-last-applied flag is set
if [ "$SET_LAST_APPLIED" = "true" ]; then
helm get manifest "${RELEASE}-${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
> $LOG_FILE.log 2>&1
fi
fi
# Add annotation last-applied-configuration if set-last-applied flag is set
if [ "$SET_LAST_APPLIED" = "true" ]; then
helm get manifest ${RELEASE} \
# 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
> $LOG_FILE.log 2>&1
fi
fi