github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: use new etcd /livez and /readyz endpoints

Browse Source 
etcd >= 3.5.11 includes new endpoints for liveness, startup
and readyness probes. Use them in 1.31.
This commit is contained in:
Lubomir I. Ivanov 2024-04-23 10:50:14 +03:00
parent a04cc020f1
commit eeac2dda70
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/phases/etcd/local.go
View File

@ -224,9 +224,12 @@ func GetEtcdPodSpec(cfg *kubeadmapi.ClusterConfiguration, endpoint *kubeadmapi.A
v1.ResourceMemory: resource.MustParse("100Mi"), v1.ResourceMemory: resource.MustParse("100Mi"),
}, },
}, },
LivenessProbe: staticpodutil.LivenessProbe(probeHostname, "/health?exclude=NOSPACE&serializable=true", probePort, probeScheme), // The etcd probe endpoints are explained here:
StartupProbe: staticpodutil.StartupProbe(probeHostname, "/health?serializable=false", probePort, probeScheme, componentHealthCheckTimeout), // https://github.com/kubernetes/kubeadm/issues/3039
Env: kubeadmutil.MergeKubeadmEnvVars(cfg.Etcd.Local.ExtraEnvs), LivenessProbe: staticpodutil.LivenessProbe(probeHostname, "/livez", probePort, probeScheme),
ReadinessProbe: staticpodutil.ReadinessProbe(probeHostname, "/readyz", probePort, probeScheme),
StartupProbe: staticpodutil.StartupProbe(probeHostname, "/readyz", probePort, probeScheme, componentHealthCheckTimeout),
Env: kubeadmutil.MergeKubeadmEnvVars(cfg.Etcd.Local.ExtraEnvs),
}, },
etcdMounts, etcdMounts,
// etcd will listen on the advertise address of the API server, in a different port (2379) // etcd will listen on the advertise address of the API server, in a different port (2379)

13
cmd/kubeadm/app/phases/etcd/local_test.go
View File

@ -129,13 +129,22 @@ spec:
failureThreshold: 8 failureThreshold: 8
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
path: /health?exclude=NOSPACE&serializable=true path: /livez
port: 2381 port: 2381
scheme: HTTP scheme: HTTP
initialDelaySeconds: 10 initialDelaySeconds: 10
periodSeconds: 10 periodSeconds: 10
timeoutSeconds: 15 timeoutSeconds: 15
name: etcd name: etcd
readinessProbe:
failureThreshold: 3
httpGet:
host: 127.0.0.1
path: /readyz
port: 2381
scheme: HTTP
periodSeconds: 1
timeoutSeconds: 15
resources: resources:
requests: requests:
cpu: 100m cpu: 100m
@ -144,7 +153,7 @@ spec:
failureThreshold: 24 failureThreshold: 24
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
path: /health?serializable=false path: /readyz
port: 2381 port: 2381
scheme: HTTP scheme: HTTP
initialDelaySeconds: 10 initialDelaySeconds: 10