From 1d695de6d0bfdd088b592f36ad9e71a33dd74404 Mon Sep 17 00:00:00 2001 From: salovasz Date: Thu, 12 Jan 2023 16:51:32 +0100 Subject: [PATCH] further fix of bash magic --- drain-watch-image/drain-watch.sh | 2 +- pkg/sdk/logging/api/v1beta1/logging_types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drain-watch-image/drain-watch.sh b/drain-watch-image/drain-watch.sh index afd6bff4b..412500ca6 100755 --- a/drain-watch-image/drain-watch.sh +++ b/drain-watch-image/drain-watch.sh @@ -18,7 +18,7 @@ done # this loop will not go on indefinitely because the custom-runner's HTTP endpoint should # come up eventually and won't terminate without a signal from outside (barring errors) echo '['$(date)']' 'waiting for custom-runner HTTP endpoint to become available' -while [ "$(curl -so /dev/null-w '%{http_code}' localhost:735)"=="000" ] +until curl -so /dev/null ${CUSTOM_RUNNER_ADDRESS} do [ -z "$DEBUG" ] && echo '['$(date)']' 'custom-runner HTTP endpoint not available, waiting' sleep 1 diff --git a/pkg/sdk/logging/api/v1beta1/logging_types.go b/pkg/sdk/logging/api/v1beta1/logging_types.go index 944eec715..b606d4e1f 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -128,7 +128,7 @@ const ( DefaultFluentdImageTag = "v1.14.6-alpine-5" DefaultFluentdBufferStorageVolumeName = "fluentd-buffer" DefaultFluentdDrainWatchImageRepository = "ghcr.io/banzaicloud/fluentd-drain-watch" - DefaultFluentdDrainWatchImageTag = "v0.0.4" + DefaultFluentdDrainWatchImageTag = "v0.0.2" DefaultFluentdDrainPauseImageRepository = "k8s.gcr.io/pause" DefaultFluentdDrainPauseImageTag = "3.2" DefaultFluentdVolumeModeImageRepository = "busybox"