Skip to content

K
k3s
Commit 72a0dc11 authored by Chao Xu's avatar Chao Xu
Browse files
Options

fix schema for kubeproxyconfig/v1alph1

parent 7b0ffb84
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml
View file @ 72a0dc11
...@@ -64,7 +64,7 @@ KubeProxy: ...@@ -64,7 +64,7 @@ KubeProxy:
minSyncPeriod: 0s minSyncPeriod: 0s
syncPeriod: 30s syncPeriod: 30s
ipvs: ipvs:
ExcludeCIDRs: null excludeCIDRs: null
minSyncPeriod: 0s minSyncPeriod: 0s
scheduler: "" scheduler: ""
syncPeriod: 30s syncPeriod: 30s
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1.yaml
View file @ 72a0dc11
...@@ -53,7 +53,7 @@ kubeProxy: ...@@ -53,7 +53,7 @@ kubeProxy:
minSyncPeriod: 0s minSyncPeriod: 0s
syncPeriod: 30s syncPeriod: 30s
ipvs: ipvs:
ExcludeCIDRs: null excludeCIDRs: null
minSyncPeriod: 0s minSyncPeriod: 0s
scheduler: "" scheduler: ""
syncPeriod: 30s syncPeriod: 30s
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1_without_TypeMeta.yaml
View file @ 72a0dc11
...@@ -50,7 +50,7 @@ kubeProxy: ...@@ -50,7 +50,7 @@ kubeProxy:
minSyncPeriod: 0s minSyncPeriod: 0s
syncPeriod: 30s syncPeriod: 30s
ipvs: ipvs:
ExcludeCIDRs: null excludeCIDRs: null
minSyncPeriod: 0s minSyncPeriod: 0s
scheduler: "" scheduler: ""
syncPeriod: 30s syncPeriod: 30s
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml
View file @ 72a0dc11
...@@ -54,7 +54,7 @@ kubeProxy: ...@@ -54,7 +54,7 @@ kubeProxy:
minSyncPeriod: 0s minSyncPeriod: 0s
syncPeriod: 30s syncPeriod: 30s
ipvs: ipvs:
ExcludeCIDRs: null excludeCIDRs: null
minSyncPeriod: 0s minSyncPeriod: 0s
scheduler: "" scheduler: ""
syncPeriod: 30s syncPeriod: 30s
......
cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml
View file @ 72a0dc11
...@@ -49,7 +49,7 @@ kubeProxy: ...@@ -49,7 +49,7 @@ kubeProxy:
minSyncPeriod: 0s minSyncPeriod: 0s
syncPeriod: 30s syncPeriod: 30s
ipvs: ipvs:
ExcludeCIDRs: null excludeCIDRs: null
minSyncPeriod: 0s minSyncPeriod: 0s
scheduler: "" scheduler: ""
syncPeriod: 30s syncPeriod: 30s
......
cmd/kubeadm/app/util/config/testdata/v1alpha1_upgrade/after.yaml
View file @ 72a0dc11
...@@ -49,7 +49,7 @@ kubeProxy: ...@@ -49,7 +49,7 @@ kubeProxy:
minSyncPeriod: 0s minSyncPeriod: 0s
syncPeriod: 30s syncPeriod: 30s
ipvs: ipvs:
ExcludeCIDRs: null excludeCIDRs: null
minSyncPeriod: 0s minSyncPeriod: 0s
scheduler: "" scheduler: ""
syncPeriod: 30s syncPeriod: 30s
......
pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go
View file @ 72a0dc11
...@@ -65,7 +65,7 @@ type KubeProxyIPVSConfiguration struct { ...@@ -65,7 +65,7 @@ type KubeProxyIPVSConfiguration struct {
Scheduler string `json:"scheduler"` Scheduler string `json:"scheduler"`
// excludeCIDRs is a list of CIDR's which the ipvs proxier should not touch // excludeCIDRs is a list of CIDR's which the ipvs proxier should not touch
// when cleaning up ipvs services. // when cleaning up ipvs services.
ExcludeCIDRs []string ExcludeCIDRs []string `json:"excludeCIDRs"`
} }
// KubeProxyConntrackConfiguration contains conntrack settings for // KubeProxyConntrackConfiguration contains conntrack settings for
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment