From 8836e03eb99806476e4c88c231e12b1d4b1c9025 Mon Sep 17 00:00:00 2001 From: loomt Date: Wed, 12 Nov 2025 10:14:34 +0800 Subject: [PATCH] use wget instead of curl --- addons/clickhouse/scripts/clickhouse-ping.sh | 22 +++++++------------- addons/clickhouse/templates/cmpd-ch.yaml | 17 +++++++++++++++ addons/clickhouse/values.yaml | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/addons/clickhouse/scripts/clickhouse-ping.sh b/addons/clickhouse/scripts/clickhouse-ping.sh index 7ac572146..903c08c0f 100644 --- a/addons/clickhouse/scripts/clickhouse-ping.sh +++ b/addons/clickhouse/scripts/clickhouse-ping.sh @@ -1,34 +1,26 @@ #!/bin/bash set -euo pipefail -TLS_MOUNT_PATH="/etc/pki/tls" -READINESS_PROBE_TIMEOUT="${READINESS_PROBE_TIMEOUT:-3}" HOST="127.0.0.1" SCHEME="http" PORT="${CLICKHOUSE_HTTP_PORT:-8123}" -curl_args=( - --silent - --show-error - --fail - --connect-timeout "${READINESS_PROBE_TIMEOUT}" - --max-time "${READINESS_PROBE_TIMEOUT}" +wget_args=( + --spider + -q + -T 3 + --tries=1 ) if [[ "${TLS_ENABLED:-false}" == "true" ]]; then SCHEME="https" PORT="${CLICKHOUSE_HTTPS_PORT:-8443}" - if [[ -f "${TLS_MOUNT_PATH}/ca.pem" ]]; then - curl_args+=(--cacert "${TLS_MOUNT_PATH}/ca.pem") - fi - if [[ -f "${TLS_MOUNT_PATH}/cert.pem" && -f "${TLS_MOUNT_PATH}/key.pem" ]]; then - curl_args+=(--cert "${TLS_MOUNT_PATH}/cert.pem" --key "${TLS_MOUNT_PATH}/key.pem") - fi + wget_args+=(--no-check-certificate) fi endpoint="${SCHEME}://${HOST}:${PORT}/ping" -if ! curl "${curl_args[@]}" "${endpoint}" >/dev/null; then +if ! /shared-tools/wget "${wget_args[@]}" "${endpoint}"; then echo "Readiness probe failed accessing ${endpoint}" >&2 exit 1 fi diff --git a/addons/clickhouse/templates/cmpd-ch.yaml b/addons/clickhouse/templates/cmpd-ch.yaml index 7bf615ece..e6f28d242 100644 --- a/addons/clickhouse/templates/cmpd-ch.yaml +++ b/addons/clickhouse/templates/cmpd-ch.yaml @@ -19,6 +19,18 @@ spec: fsGroup: 0 seccompProfile: type: RuntimeDefault + initContainers: + - name: copy-tools + imagePullPolicy: {{ .Values.busyboxImage.pullPolicy }} + command: + - sh + - -c + - | + cp /bin/wget /shared-tools/wget + chmod +x /shared-tools/wget + volumeMounts: + - name: shared-tools + mountPath: /shared-tools containers: - name: clickhouse imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} @@ -70,12 +82,17 @@ spec: mountPath: /etc/clickhouse-client - name: scripts mountPath: /scripts + - name: shared-tools + mountPath: /shared-tools env: - name: CURRENT_POD_NAME valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.name + volumes: + - name: shared-tools + emptyDir: {} updateStrategy: BestEffortParallel logConfigs: {{- range $name, $pattern := .Values.logConfigs }} diff --git a/addons/clickhouse/values.yaml b/addons/clickhouse/values.yaml index 33de11b89..55cfe31b1 100644 --- a/addons/clickhouse/values.yaml +++ b/addons/clickhouse/values.yaml @@ -49,4 +49,4 @@ backupImage: registry: "" repository: apecloud/clickhouse-backup-full pullPolicy: IfNotPresent - tag: 2.6.14 \ No newline at end of file + tag: 2.6.14