diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 315a008604b1..23bb0665f1ef 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -63,12 +63,11 @@ dns: etcd: local: dataDir: {{.EtcdDataDir}} -{{- if .EtcdExtraArgs}} extraArgs: + proxy-refresh-interval: "70000" {{- range $i, $val := printMapInOrder .EtcdExtraArgs ": " }} {{$val}} {{- end}} -{{- end}} controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index cbf0a6f9b2ec..10b16c79ef56 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index 8a697f119bbd..3cd14fc1aca1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index a1b54a74b9cc..928385bea4e5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index 0dd6b113c37c..b8309685d71e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -41,6 +41,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index d743b51813b5..176dc7885e7c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 5f8e0ff07654..91decc51dc12 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 422dfb674f5a..ad58257e9eba 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index 068693708607..ebe9637fb14d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -32,6 +32,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 1a06d209d4ba..b7558c4a57f9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -38,6 +38,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml index f8fc9fe04c66..7176081d05fa 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml index 297a7954ba8a..4ef6e032036f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index cf350e25d8dc..ab01ac609f64 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml index e4406850fc9c..5393f1ea8fe7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml @@ -41,6 +41,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index fc3d085e8ea7..8c904fafc835 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 10a34a6a4958..8f705884d8cd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index 53abad09d5cd..08eca1ab6ce7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml index 4604473a942c..dd634650ffb6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -32,6 +32,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index b7738879f1d7..782a74c8c3d5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -38,6 +38,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml index f24e301f2351..5c4641260352 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml index 9a28d8d9d585..3270ee91122d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 1a691bbecc34..944f6e3f374b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml index fbeeb7faeaba..f2788b144942 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml @@ -41,6 +41,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index ec6bf1e95e4c..faca2cc7cef9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index 8e4b49d7f774..86d214edb612 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index ec261f885318..b4d7860fea61 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -31,6 +31,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml index 2fb1d335263c..933aaee359b0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -32,6 +32,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index bbef94d4eb40..216b59b45d22 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -38,6 +38,8 @@ dns: etcd: local: dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" controllerManager: extraArgs: "leader-elect": "false"