Skip to content

Commit 7d292eb

Browse files
myasnikovdaniilmyasnikovdaniil
committed
chore(e2e): drop seaweedfs/monitoring flux-reconcile workaround
With Strategy=RetryOnFailure + RetryInterval=30s plus the bats --set cozystackOperator.helmReleaseInterval=30s override, the existing 2m wait converges without the manual flux reconcile --force band-aid. Removing the workaround turns CI itself into the test of the fix. Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent 929c623 commit 7d292eb

1 file changed

Lines changed: 1 addition & 10 deletions

File tree

‎hack/e2e-install-cozystack.bats‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,7 @@ EOF
155155
timeout 60 sh -ec 'until kubectl get hr -n tenant-root etcd ingress monitoring seaweedfs tenant-root >/dev/null 2>&1; do sleep 1; done'
156156
kubectl wait hr/etcd hr/ingress hr/tenant-root hr/seaweedfs -n tenant-root --timeout=4m --for=condition=ready
157157

158-
# TODO: Workaround ingress unvailability issue
159-
if ! kubectl wait hr/monitoring -n tenant-root --timeout=2m --for=condition=ready; then
160-
flux reconcile hr monitoring -n tenant-root --force
161-
kubectl wait hr/monitoring -n tenant-root --timeout=2m --for=condition=ready
162-
fi
163-
164-
if ! kubectl wait hr/seaweedfs-system -n tenant-root --timeout=2m --for=condition=ready; then
165-
flux reconcile hr seaweedfs-system -n tenant-root --force
166-
kubectl wait hr/seaweedfs-system -n tenant-root --timeout=2m --for=condition=ready
167-
fi
158+
kubectl wait hr/monitoring hr/seaweedfs-system -n tenant-root --timeout=2m --for=condition=ready
168159

169160

170161
# Expose Cozystack services through ingress

0 commit comments

Comments
 (0)