github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111383 from p0lyn0mial/kubeadm-etcd-progress-notificaiton

Browse Source 
kubeadm: pass etcd progress notification flag to etcd
This commit is contained in:
Kubernetes Prow Robot 2022-07-25 04:32:35 -07:00 committed by GitHub
commit bc974c8ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,6 +239,7 @@ func getEtcdCommand(cfg *kubeadmapi.ClusterConfiguration, endpoint *kubeadmapi.A
"peer-client-cert-auth": "true",
"snapshot-count": "10000",
"listen-metrics-urls": fmt.Sprintf("http://%s", net.JoinHostPort(etcdLocalhostAddress, strconv.Itoa(kubeadmconstants.EtcdMetricsPort))),
"experimental-watch-progress-notify-interval": "5s",
}
if len(initialCluster) == 0 {

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

@ -177,6 +177,7 @@ func TestGetEtcdCommand(t *testing.T) {
"etcd",
"--name=foo",
"--experimental-initial-corrupt-check=true",
"--experimental-watch-progress-notify-interval=5s",
fmt.Sprintf("--listen-client-urls=https://127.0.0.1:%d,https://1.2.3.4:%d", kubeadmconstants.EtcdListenClientPort, kubeadmconstants.EtcdListenClientPort),
fmt.Sprintf("--listen-metrics-urls=http://127.0.0.1:%d", kubeadmconstants.EtcdMetricsPort),
fmt.Sprintf("--advertise-client-urls=https://1.2.3.4:%d", kubeadmconstants.EtcdListenClientPort),
@ -207,6 +208,7 @@ func TestGetEtcdCommand(t *testing.T) {
"etcd",
"--name=foo",
"--experimental-initial-corrupt-check=true",
"--experimental-watch-progress-notify-interval=5s",
fmt.Sprintf("--listen-client-urls=https://127.0.0.1:%d,https://1.2.3.4:%d", kubeadmconstants.EtcdListenClientPort, kubeadmconstants.EtcdListenClientPort),
fmt.Sprintf("--listen-metrics-urls=http://127.0.0.1:%d", kubeadmconstants.EtcdMetricsPort),
fmt.Sprintf("--advertise-client-urls=https://1.2.3.4:%d", kubeadmconstants.EtcdListenClientPort),
@ -238,6 +240,7 @@ func TestGetEtcdCommand(t *testing.T) {
"etcd",
"--name=bar",
"--experimental-initial-corrupt-check=true",
"--experimental-watch-progress-notify-interval=5s",
"--listen-client-urls=https://10.0.1.10:2379",
fmt.Sprintf("--listen-metrics-urls=http://127.0.0.1:%d", kubeadmconstants.EtcdMetricsPort),
"--advertise-client-urls=https://10.0.1.10:2379",
@ -264,6 +267,7 @@ func TestGetEtcdCommand(t *testing.T) {
"etcd",
"--name=foo",
"--experimental-initial-corrupt-check=true",
"--experimental-watch-progress-notify-interval=5s",
fmt.Sprintf("--listen-client-urls=https://[::1]:%d,https://[2001:db8::3]:%d", kubeadmconstants.EtcdListenClientPort, kubeadmconstants.EtcdListenClientPort),
fmt.Sprintf("--listen-metrics-urls=http://[::1]:%d", kubeadmconstants.EtcdMetricsPort),
fmt.Sprintf("--advertise-client-urls=https://[2001:db8::3]:%d", kubeadmconstants.EtcdListenClientPort),