github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix schema for kubeproxyconfig/v1alph1

pull/8/head
Chao Xu 2018-06-12 18:01:39 -07:00
parent 7b0ffb8410
commit 72a0dc1122
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml vendored
View File

@ -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

2
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1.yaml vendored
View File

@ -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

2
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1_without_TypeMeta.yaml vendored
View File

@ -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

2
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml vendored
View File

@ -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

2
cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml vendored
View File

@ -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

2
cmd/kubeadm/app/util/config/testdata/v1alpha1_upgrade/after.yaml vendored
View File

@ -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

2
pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go
View File

@ -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