chore: adopt old cluster without restart (#2437) (#2438)

Author: loomts

addons/clickhouse/scripts/clickhouse-ping.sh

@@ -2,11 +2,6 @@
 set -euo pipefail
 
 PORT="${CLICKHOUSE_HTTP_PORT:-8123}"
-CURL_ARGS=(
-	-sf
-	--max-time 3
-	"http://127.0.0.1:${PORT}/ping"
-)
 
 if [[ "${TLS_ENABLED:-false}" == "true" ]]; then
 	PORT="${CLICKHOUSE_HTTPS_PORT:-8443}"
@@ -18,9 +13,20 @@ if [[ "${TLS_ENABLED:-false}" == "true" ]]; then
 		--key /etc/pki/tls/key.pem
 		"https://127.0.0.1:${PORT}/ping"
 	)
-fi
-
-if ! /shared-tools/curl "${CURL_ARGS[@]}" >/dev/null; then
-	echo "Readiness probe failed" >&2
-	exit 1
+	if ! /shared-tools/curl "${CURL_ARGS[@]}" >/dev/null; then
+		echo "Readiness probe failed" >&2
+		exit 1
+	fi
+else
+	wget_args=(
+		-O /dev/null
+		-q
+		-T 3
+		--tries=1
+	)
+	endpoint="http://127.0.0.1:${PORT}/ping"
+	if ! /shared-tools/wget "${wget_args[@]}" "${endpoint}"; then
+		echo "Readiness probe failed accessing ${endpoint}" >&2
+		exit 1
+	fi
 fi

addons/clickhouse/templates/cmpd-ch.yaml

@@ -25,7 +25,9 @@ spec:
           - -c
           - |
             cp /bin/curl /shared-tools/curl
+            cp /bin/wget /shared-tools/wget
             chmod +x /shared-tools/curl
+            chmod +x /shared-tools/wget
         volumeMounts:
           - name: shared-tools
             mountPath: /shared-tools