Skip to content

Commit 5b4bb49

Browse files
committed
Check if there are helmreleases before trying to check their status
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent 8082902 commit 5b4bb49

1 file changed

Lines changed: 17 additions & 15 deletions

File tree

tools/helm-test/deploy-dependencies

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,23 @@ if [ "${fluxDeployed}" == "true" ]; then
162162
FIVE_MINUTES=300
163163

164164
readyReleases=0
165-
helmReleaseCount=$(flux get helmreleases --all-namespaces --no-header | wc -l | sed 's/^[[:space:]]*//')
166-
for i in $(seq 1 ${FIVE_MINUTES}); do
167-
newReadyReleases=$(flux get helmreleases --all-namespaces --status-selector ready=true --no-header | wc -l | sed 's/^[[:space:]]*//')
168-
if [ "${readyReleases}" -ne "${newReadyReleases}" ]; then
169-
readyReleases="${newReadyReleases}"
170-
echo "#### Helm releases ready: ${readyReleases}/${helmReleaseCount}"
171-
fi
165+
helmReleaseCount=$(kubectl get helmreleases --all-namespaces --output name | wc -l | sed 's/^[[:space:]]*//')
166+
if [ "${helmReleaseCount}" -gt 0 ]; then
167+
for i in $(seq 1 ${FIVE_MINUTES}); do
168+
newReadyReleases=$(flux get helmreleases --all-namespaces --status-selector ready=true --no-header | wc -l | sed 's/^[[:space:]]*//')
169+
if [ "${readyReleases}" -ne "${newReadyReleases}" ]; then
170+
readyReleases="${newReadyReleases}"
171+
echo "#### Helm releases ready: ${readyReleases}/${helmReleaseCount}"
172+
fi
172173

173-
if [ "${readyReleases}" -ge "${helmReleaseCount}" ]; then break; fi
174+
if [ "${readyReleases}" -ge "${helmReleaseCount}" ]; then break; fi
174175

175-
if [ "${i}" -eq ${FIVE_MINUTES} ]; then
176-
echo "A Helm release failed to become ready in ${FIVE_MINUTES} minutes"
177-
flux get helmreleases --all-namespaces
178-
exit 1
179-
fi
180-
sleep 1
181-
done
176+
if [ "${i}" -eq ${FIVE_MINUTES} ]; then
177+
echo "A Helm release failed to become ready in ${FIVE_MINUTES} minutes"
178+
flux get helmreleases --all-namespaces
179+
exit 1
180+
fi
181+
sleep 1
182+
done
183+
fi
182184
fi

0 commit comments

Comments
 (0)