Skip to content

Commit 9ed3db1

Browse files
liubog2008liubog2008
committed
fix wget issue
Signed-off-by: liubo02 <liubo02@pingcap.com>
1 parent 7349c3a commit 9ed3db1

17 files changed

+64
-31
lines changed

‎pkg/manager/member/startscript/v1/render_script.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ func RenderTiCDCStartScript(tc *v1alpha1.TidbCluster) (string, error) {
187187
var script string
188188
serverCmd := strings.Join(cmdArgs, " ")
189189

190-
wgetDiscoveryPrefix := "http"
190+
discoveryFetchPrefix := "wget -qO- -T 3 http"
191191
if tc.IsDiscoveryMTLSEnabled() {
192-
wgetDiscoveryPrefix = "--ca-certificate=/var/lib/ticdc-tls/ca.crt --certificate=/var/lib/ticdc-tls/tls.crt --private-key=/var/lib/ticdc-tls/tls.key https"
192+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
193+
discoveryFetchPrefix = "curl -sS --fail --max-time 3 --cacert /var/lib/ticdc-tls/ca.crt --cert /var/lib/ticdc-tls/tls.crt --key /var/lib/ticdc-tls/tls.key https"
193194
}
194195

195196
if changefeedInfo.Enabled {
@@ -234,13 +235,13 @@ wait ${CDC_PID}
234235
pd_url="%s"
235236
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
236237
discovery_url="%s-discovery.${NAMESPACE}:10261"
237-
until result=$(wget -qO- -T 3 %s://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
238+
until result=$(%s://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
238239
echo "waiting for the verification of PD endpoints ..."
239240
sleep 2
240241
done
241242
`
242243

243-
script += fmt.Sprintf(str, pdAddr, tc.GetName(), wgetDiscoveryPrefix)
244+
script += fmt.Sprintf(str, pdAddr, tc.GetName(), discoveryFetchPrefix)
244245
script += "\n" + changefeedScript
245246
} else {
246247
script = "set -uo pipefail\n" + changefeedScript
@@ -258,13 +259,13 @@ done
258259
pd_url="%s"
259260
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
260261
discovery_url="%s-discovery.${NAMESPACE}:10261"
261-
until result=$(wget -qO- -T 3 %s://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
262+
until result=$(%s://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
262263
echo "waiting for the verification of PD endpoints ..."
263264
sleep 2
264265
done
265266
`
266267

267-
script += fmt.Sprintf(str, pdAddr, tc.GetName(), wgetDiscoveryPrefix)
268+
script += fmt.Sprintf(str, pdAddr, tc.GetName(), discoveryFetchPrefix)
268269
script += "\n" + strings.Join(append([]string{"exec"}, cmdArgs...), " ")
269270
} else {
270271
script = serverCmd
@@ -435,15 +436,16 @@ func RenderTiFlashInitScript(tc *v1alpha1.TidbCluster) (string, error) {
435436
} else {
436437
pdAddr = fmt.Sprintf("http://%s-pd:%d", tcName, v1alpha1.DefaultPDClientPort)
437438
}
438-
wgetDiscoveryPrefix := "http"
439+
discoveryFetchPrefix := "wget -qO- -T 3 http"
439440
if tc.IsDiscoveryMTLSEnabled() {
440-
wgetDiscoveryPrefix = "--ca-certificate=/var/lib/tiflash-tls/ca.crt --certificate=/var/lib/tiflash-tls/tls.crt --private-key=/var/lib/tiflash-tls/tls.key https"
441+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
442+
discoveryFetchPrefix = "curl -sS --fail --max-time 3 --cacert /var/lib/tiflash-tls/ca.crt --cert /var/lib/tiflash-tls/tls.crt --key /var/lib/tiflash-tls/tls.key https"
441443
}
442444
str := `pd_url="%s"
443445
set +e
444446
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
445447
discovery_url="%s-discovery.%s:10261"
446-
until result=$(wget -qO- -T 3 %s://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g' | sed 's/https:\/\///g'); do
448+
until result=$(%s://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g' | sed 's/https:\/\///g'); do
447449
echo "waiting for the verification of PD endpoints ..."
448450
sleep 2
449451
done
@@ -453,7 +455,7 @@ sed -i s/PD_ADDR/${result}/g /data0/config.toml
453455
sed -i s/PD_ADDR/${result}/g /data0/proxy.toml
454456
`
455457
script += "\n"
456-
script += fmt.Sprintf(str, pdAddr, tc.GetName(), tc.GetNamespace(), wgetDiscoveryPrefix)
458+
script += fmt.Sprintf(str, pdAddr, tc.GetName(), tc.GetNamespace(), discoveryFetchPrefix)
457459
}
458460

459461
return script, nil

‎pkg/manager/member/startscript/v1/template.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ POD_NAME=${POD_NAME:-$HOSTNAME}{{ if .AcrossK8s }}
6868
pd_url="{{ .Path }}"
6969
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
7070
discovery_url="${CLUSTER_NAME}-discovery.${NAMESPACE}:10261"
71-
until result=$(wget -qO- -T 3 {{ if .DiscoveryMTLS }}--ca-certificate={{ .ClusterCertPath }}/ca.crt --certificate={{ .ClusterCertPath }}/tls.crt --private-key={{ .ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g'); do
71+
until result=$({{ if .DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .ClusterCertPath }}/ca.crt --cert {{ .ClusterCertPath }}/tls.crt --key {{ .ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g'); do
7272
echo "waiting for the verification of PD endpoints ..."
7373
sleep $((RANDOM % 5))
7474
done
@@ -205,7 +205,7 @@ join=${join%,}
205205
ARGS="${ARGS} --join=${join}"
206206
elif [[ ! -d {{ .DataDir }}/member/wal ]]
207207
then
208-
until result=$(wget -qO- -T 3 {{ if .DiscoveryMTLS }}--ca-certificate={{ .ClusterCertPath }}/ca.crt --certificate={{ .ClusterCertPath }}/tls.crt --private-key={{ .ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/new/${encoded_domain_url} 2>/dev/null); do
208+
until result=$({{ if .DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .ClusterCertPath }}/ca.crt --cert {{ .ClusterCertPath }}/tls.crt --key {{ .ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}://${discovery_url}/new/${encoded_domain_url} 2>/dev/null); do
209209
echo "waiting for discovery service to return start args ..."
210210
sleep $((RANDOM % 5))
211211
done
@@ -292,7 +292,7 @@ pd_url="{{ .PDAddress }}"
292292
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
293293
discovery_url="${CLUSTER_NAME}-discovery.${NAMESPACE}:10261"
294294
295-
until result=$(wget -qO- -T 3 {{ if .DiscoveryMTLS }}--ca-certificate={{ .ClusterCertPath }}/ca.crt --certificate={{ .ClusterCertPath }}/tls.crt --private-key={{ .ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
295+
until result=$({{ if .DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .ClusterCertPath }}/ca.crt --cert {{ .ClusterCertPath }}/tls.crt --key {{ .ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
296296
echo "waiting for the verification of PD endpoints ..."
297297
sleep $((RANDOM % 5))
298298
done
@@ -351,7 +351,7 @@ var pumpStartScriptTplText = `{{ if .AcrossK8s }}
351351
pd_url="{{ .PDAddr }}"
352352
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
353353
discovery_url="{{ .ClusterName }}-discovery.{{ .Namespace }}:10261"
354-
until result=$(wget -qO- -T 3 {{ if .DiscoveryMTLS }}--ca-certificate={{ .ClusterCertPath }}/ca.crt --certificate={{ .ClusterCertPath }}/tls.crt --private-key={{ .ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
354+
until result=$({{ if .DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .ClusterCertPath }}/ca.crt --cert {{ .ClusterCertPath }}/tls.crt --key {{ .ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
355355
echo "waiting for the verification of PD endpoints ..."
356356
sleep $((RANDOM % 5))
357357
done
@@ -720,7 +720,7 @@ pd_url="{{ .PDAddress }}"
720720
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
721721
discovery_url="${CLUSTER_NAME}-discovery.${NAMESPACE}:10261"
722722
723-
until result=$(wget -qO- -T 3 {{ if .DiscoveryMTLS }}--ca-certificate={{ .ClusterCertPath }}/ca.crt --certificate={{ .ClusterCertPath }}/tls.crt --private-key={{ .ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
723+
until result=$({{ if .DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .ClusterCertPath }}/ca.crt --cert {{ .ClusterCertPath }}/tls.crt --key {{ .ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
724724
echo "waiting for the verification of PD endpoints ..."
725725
sleep $((RANDOM % 5))
726726
done

‎pkg/manager/member/startscript/v2/common.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ type AcrossK8sScriptModel struct {
116116
PDAddr string
117117

118118
// DiscoveryMTLS indicates whether mTLS is enabled on the discovery server.
119-
// When true, wget uses HTTPS with the component's own cluster certificate.
119+
// When true, the startup script uses curl with the component's own cluster
120+
// certificate because wget in the runtime image does not reliably present the client cert.
120121
DiscoveryMTLS bool
121122

122123
// ClusterCertPath is the path to the component's own cluster TLS certificate directory.

‎pkg/manager/member/startscript/v2/pd_start_script.go‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,13 @@ done
258258
`
259259

260260
// pdStartScript is the template of start script.
261+
//
262+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
263+
pdDiscoveryFetchPrefix = `{{ if .DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .ClusterCertPath }}/ca.crt --cert {{ .ClusterCertPath }}/tls.crt --key {{ .ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}`
264+
265+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
266+
acrossK8sPDDiscoveryFetchPrefix = `{{ if .AcrossK8s.DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .AcrossK8s.ClusterCertPath }}/ca.crt --cert {{ .AcrossK8s.ClusterCertPath }}/tls.crt --key {{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}`
267+
261268
pdStartScript = `
262269
PD_POD_NAME=${POD_NAME:-$HOSTNAME}
263270
PD_DOMAIN={{ .PDDomain }}` +
@@ -282,7 +289,7 @@ if [[ -f {{ .DataDir }}/join ]]; then
282289
elif [[ ! -d {{ .DataDir }}/member/wal ]]; then
283290
encoded_domain_url=$(echo ${PD_DOMAIN}:2380 | base64 | tr "\n" " " | sed "s/ //g")
284291
285-
until result=$(wget -qO- -T 3 {{ if .DiscoveryMTLS }}--ca-certificate={{ .ClusterCertPath }}/ca.crt --certificate={{ .ClusterCertPath }}/tls.crt --private-key={{ .ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://{{ .DiscoveryAddr }}/new/${encoded_domain_url} 2>/dev/null); do
292+
until result=$(` + pdDiscoveryFetchPrefix + `://{{ .DiscoveryAddr }}/new/${encoded_domain_url} 2>/dev/null); do
286293
echo "waiting for discovery service to return start args ..."
287294
sleep $((RANDOM % 5))
288295
done
@@ -302,7 +309,7 @@ exec /pd-server ${ARGS}
302309
pd_url={{ .AcrossK8s.PDAddr }}
303310
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
304311
discovery_url={{ .AcrossK8s.DiscoveryAddr }}
305-
until result=$(wget -qO- -T 3 {{ if .AcrossK8s.DiscoveryMTLS }}--ca-certificate={{ .AcrossK8s.ClusterCertPath }}/ca.crt --certificate={{ .AcrossK8s.ClusterCertPath }}/tls.crt --private-key={{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g'); do
312+
until result=$(` + acrossK8sPDDiscoveryFetchPrefix + `://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g'); do
306313
echo "waiting for the verification of PD endpoints ..."
307314
sleep $((RANDOM % 5))
308315
done

‎pkg/manager/member/startscript/v2/pd_start_script_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ if [[ -f /var/lib/pd/join ]]; then
882882
elif [[ ! -d /var/lib/pd/member/wal ]]; then
883883
encoded_domain_url=$(echo ${PD_DOMAIN}:2380 | base64 | tr "\n" " " | sed "s/ //g")
884884
885-
until result=$(wget -qO- -T 3 --ca-certificate=/var/lib/pd-tls/ca.crt --certificate=/var/lib/pd-tls/tls.crt --private-key=/var/lib/pd-tls/tls.key https://start-script-test-discovery.start-script-test-ns:10261/new/${encoded_domain_url} 2>/dev/null); do
885+
until result=$(curl -sS --fail --max-time 3 --cacert /var/lib/pd-tls/ca.crt --cert /var/lib/pd-tls/tls.crt --key /var/lib/pd-tls/tls.key https://start-script-test-discovery.start-script-test-ns:10261/new/${encoded_domain_url} 2>/dev/null); do
886886
echo "waiting for discovery service to return start args ..."
887887
sleep $((RANDOM % 5))
888888
done

‎pkg/manager/member/startscript/v2/pump_start_script.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,16 @@ func RenderPumpStartScript(tc *v1alpha1.TidbCluster) (string, error) {
6868

6969
const (
7070
// pumpStartSubScript contains optional subscripts used in start script.
71+
//
72+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
73+
pumpAcrossK8sDiscoveryFetchPrefix = `{{ if .AcrossK8s.DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .AcrossK8s.ClusterCertPath }}/ca.crt --cert {{ .AcrossK8s.ClusterCertPath }}/tls.crt --key {{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}`
74+
7175
pumpStartSubScript = `
7276
{{ define "AcrossK8sSubscript" }}
7377
pd_url={{ .AcrossK8s.PDAddr }}
7478
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
7579
discovery_url={{ .AcrossK8s.DiscoveryAddr }}
76-
until result=$(wget -qO- -T 3 {{ if .AcrossK8s.DiscoveryMTLS }}--ca-certificate={{ .AcrossK8s.ClusterCertPath }}/ca.crt --certificate={{ .AcrossK8s.ClusterCertPath }}/tls.crt --private-key={{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
80+
until result=$(` + pumpAcrossK8sDiscoveryFetchPrefix + `://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
7781
echo "waiting for the verification of PD endpoints ..."
7882
sleep $((RANDOM % 5))
7983
done

‎pkg/manager/member/startscript/v2/pump_start_script_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ PUMP_POD_NAME=$HOSTNAME
338338
pd_url=https://start-script-test-pd:2379
339339
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
340340
discovery_url=start-script-test-discovery.start-script-test-ns:10261
341-
until result=$(wget -qO- -T 3 --ca-certificate=/var/lib/pump-tls/ca.crt --certificate=/var/lib/pump-tls/tls.crt --private-key=/var/lib/pump-tls/tls.key https://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
341+
until result=$(curl -sS --fail --max-time 3 --cacert /var/lib/pump-tls/ca.crt --cert /var/lib/pump-tls/tls.crt --key /var/lib/pump-tls/tls.key https://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
342342
echo "waiting for the verification of PD endpoints ..."
343343
sleep $((RANDOM % 5))
344344
done

‎pkg/manager/member/startscript/v2/ticdc_start_script.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,16 @@ func escapeSingleQuotes(input string) string {
236236

237237
const (
238238
// ticdcStartSubScript contains optional subscripts used in start script.
239+
//
240+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
241+
ticdcAcrossK8sDiscoveryFetchPrefix = `{{ if .AcrossK8s.DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .AcrossK8s.ClusterCertPath }}/ca.crt --cert {{ .AcrossK8s.ClusterCertPath }}/tls.crt --key {{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}`
242+
239243
ticdcStartSubScript = `
240244
{{ define "AcrossK8sSubscript" }}
241245
pd_url={{ .AcrossK8s.PDAddr }}
242246
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
243247
discovery_url={{ .AcrossK8s.DiscoveryAddr }}
244-
until result=$(wget -qO- -T 3 {{ if .AcrossK8s.DiscoveryMTLS }}--ca-certificate={{ .AcrossK8s.ClusterCertPath }}/ca.crt --certificate={{ .AcrossK8s.ClusterCertPath }}/tls.crt --private-key={{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
248+
until result=$(` + ticdcAcrossK8sDiscoveryFetchPrefix + `://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
245249
echo "waiting for the verification of PD endpoints ..."
246250
sleep $((RANDOM % 5))
247251
done

‎pkg/manager/member/startscript/v2/ticdc_start_script_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ TICDC_POD_NAME=${POD_NAME}
388388
pd_url=https://start-script-test-pd:2379
389389
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
390390
discovery_url=start-script-test-discovery.start-script-test-ns:10261
391-
until result=$(wget -qO- -T 3 --ca-certificate=/var/lib/ticdc-tls/ca.crt --certificate=/var/lib/ticdc-tls/tls.crt --private-key=/var/lib/ticdc-tls/tls.key https://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
391+
until result=$(curl -sS --fail --max-time 3 --cacert /var/lib/ticdc-tls/ca.crt --cert /var/lib/ticdc-tls/tls.crt --key /var/lib/ticdc-tls/tls.key https://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null); do
392392
echo "waiting for the verification of PD endpoints ..."
393393
sleep $((RANDOM % 5))
394394
done

‎pkg/manager/member/startscript/v2/tidb_start_script.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,16 @@ func RenderTiDBStartScript(tc *v1alpha1.TidbCluster) (string, error) {
8383

8484
const (
8585
// tidbStartSubScript contains optional subscripts used in start script.
86+
//
87+
// Use curl for discovery mTLS because wget in the runtime image does not reliably present the client cert.
88+
tidbAcrossK8sDiscoveryFetchPrefix = `{{ if .AcrossK8s.DiscoveryMTLS }}curl -sS --fail --max-time 3 --cacert {{ .AcrossK8s.ClusterCertPath }}/ca.crt --cert {{ .AcrossK8s.ClusterCertPath }}/tls.crt --key {{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}wget -qO- -T 3 http{{ end }}`
89+
8690
tidbStartSubScript = `
8791
{{ define "AcrossK8sSubscript" }}
8892
pd_url={{ .AcrossK8s.PDAddr }}
8993
encoded_domain_url=$(echo $pd_url | base64 | tr "\n" " " | sed "s/ //g")
9094
discovery_url={{ .AcrossK8s.DiscoveryAddr }}
91-
until result=$(wget -qO- -T 3 {{ if .AcrossK8s.DiscoveryMTLS }}--ca-certificate={{ .AcrossK8s.ClusterCertPath }}/ca.crt --certificate={{ .AcrossK8s.ClusterCertPath }}/tls.crt --private-key={{ .AcrossK8s.ClusterCertPath }}/tls.key https{{ else }}http{{ end }}://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g'); do
95+
until result=$(` + tidbAcrossK8sDiscoveryFetchPrefix + `://${discovery_url}/verify/${encoded_domain_url} 2>/dev/null | sed 's/http:\/\///g'); do
9296
echo "waiting for the verification of PD endpoints ..."
9397
sleep $((RANDOM % 5))
9498
done

0 commit comments

Comments
 (0)