From 2de84ddae5757f9ea88a5d086fc69493d021b144 Mon Sep 17 00:00:00 2001 From: nicolaferraro Date: Thu, 7 Apr 2022 11:27:11 +0200 Subject: [PATCH] operator: try fix --- src/go/k8s/pkg/resources/statefulset.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/go/k8s/pkg/resources/statefulset.go b/src/go/k8s/pkg/resources/statefulset.go index 93361e367f146..246f4b8c241e3 100644 --- a/src/go/k8s/pkg/resources/statefulset.go +++ b/src/go/k8s/pkg/resources/statefulset.go @@ -557,8 +557,8 @@ func (r *StatefulSetResource) getPreStopHook() *corev1.Handler { curlGetCommand := r.composeCURLMaintenanceCommand(`--silent`, &genericMaintenancePath) cmd := strings.Join( []string{ - fmt.Sprintf(`until [ "${status:-}" = "200" ]; do status=$(%s); sleep 0.5; done`, curlCommand), - fmt.Sprintf(`until [ "${finished:-}" = "true" ]; do finished=$(%s | grep -o '\"finished\":[^,}]*' | grep -o '[^: ]*$'); sleep 0.5; done`, curlGetCommand), + fmt.Sprintf(`until [ "${status:-}" = "200" ] || [ "${status:-}" = "400" ]; do status=$(%s); sleep 0.5; done`, curlCommand), + fmt.Sprintf(`until [ "${status:-}" = "400" ] || [ "${finished:-}" = "true" ]; do finished=$(%s | grep -o '\"finished\":[^,}]*' | grep -o '[^: ]*$'); sleep 0.5; done`, curlGetCommand), }, " && ") return &corev1.Handler{