Skip to content

Commit 56adba3

Browse files
prezhapavansaikrishna78
authored andcommitted
remove deprecated proxy-refresh-interval v2 etcd flag (kubernetes#21278)
1 parent 6c68d44 commit 56adba3

37 files changed

+2
-111
lines changed

hack/update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:12345
4141
etcd:
4242
local:
4343
dataDir: /var/lib/minikube/etcd
44-
extraArgs:
45-
- name: "proxy-refresh-interval"
46-
value: "70000"
4744
kubernetesVersion: v1.23.0
4845
networking:
4946
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4141
etcd:
4242
local:
4343
dataDir: /var/lib/minikube/etcd
44-
extraArgs:
45-
- name: "proxy-refresh-interval"
46-
value: "70000"
4744
kubernetesVersion: v1.23.0
4845
networking:
4946
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/containerd.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4141
etcd:
4242
local:
4343
dataDir: /var/lib/minikube/etcd
44-
extraArgs:
45-
- name: "proxy-refresh-interval"
46-
value: "70000"
4744
kubernetesVersion: v1.23.0
4845
networking:
4946
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
5353
etcd:
5454
local:
5555
dataDir: /var/lib/minikube/etcd
56-
extraArgs:
57-
- name: "proxy-refresh-interval"
58-
value: "70000"
5956
kubernetesVersion: v1.23.0
6057
networking:
6158
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/crio.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4141
etcd:
4242
local:
4343
dataDir: /var/lib/minikube/etcd
44-
extraArgs:
45-
- name: "proxy-refresh-interval"
46-
value: "70000"
4744
kubernetesVersion: v1.23.0
4845
networking:
4946
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/default.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4141
etcd:
4242
local:
4343
dataDir: /var/lib/minikube/etcd
44-
extraArgs:
45-
- name: "proxy-refresh-interval"
46-
value: "70000"
4744
kubernetesVersion: v1.23.0
4845
networking:
4946
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/dns.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4141
etcd:
4242
local:
4343
dataDir: /var/lib/minikube/etcd
44-
extraArgs:
45-
- name: "proxy-refresh-interval"
46-
value: "70000"
4744
kubernetesVersion: v1.23.0
4845
networking:
4946
dnsDomain: minikube.local

hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4242
etcd:
4343
local:
4444
dataDir: /var/lib/minikube/etcd
45-
extraArgs:
46-
- name: "proxy-refresh-interval"
47-
value: "70000"
4845
kubernetesVersion: v1.23.0
4946
networking:
5047
dnsDomain: cluster.local

hack/update/kubernetes_version/templates/v1beta4/options.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ controlPlaneEndpoint: control-plane.minikube.internal:8443
4747
etcd:
4848
local:
4949
dataDir: /var/lib/minikube/etcd
50-
extraArgs:
51-
- name: "proxy-refresh-interval"
52-
value: "70000"
5350
kubernetesVersion: v1.23.0
5451
networking:
5552
dnsDomain: cluster.local

pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta4.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,12 @@ controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}}
6363
etcd:
6464
local:
6565
dataDir: {{.EtcdDataDir}}
66-
extraArgs:
67-
- name: "proxy-refresh-interval"
68-
value: "70000"
66+
{{- if .EtcdExtraArgs}} extraArgs:
6967
{{- range $key, $val := .EtcdExtraArgs }}
7068
- name: "{{$key}}"
7169
value: "{{$val}}"
7270
{{- end}}
71+
{{- end}}
7372
kubernetesVersion: {{.KubernetesVersion}}
7473
networking:
7574
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}

0 commit comments

Comments
 (0)