diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml index 9996fa33f24..3364c14fd6e 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml @@ -64,7 +64,7 @@ KubeProxy: minSyncPeriod: 0s syncPeriod: 30s ipvs: - ExcludeCIDRs: null + excludeCIDRs: null minSyncPeriod: 0s scheduler: "" syncPeriod: 30s diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1.yaml index 75f36c4279f..1ad3415af1d 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1.yaml @@ -53,7 +53,7 @@ kubeProxy: minSyncPeriod: 0s syncPeriod: 30s ipvs: - ExcludeCIDRs: null + excludeCIDRs: null minSyncPeriod: 0s scheduler: "" syncPeriod: 30s diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1_without_TypeMeta.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1_without_TypeMeta.yaml index e8065236cae..dfaccd79534 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1_without_TypeMeta.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha1_without_TypeMeta.yaml @@ -50,7 +50,7 @@ kubeProxy: minSyncPeriod: 0s syncPeriod: 30s ipvs: - ExcludeCIDRs: null + excludeCIDRs: null minSyncPeriod: 0s scheduler: "" syncPeriod: 30s diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml index c83e9bc1471..f8af262b3fb 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml @@ -54,7 +54,7 @@ kubeProxy: minSyncPeriod: 0s syncPeriod: 30s ipvs: - ExcludeCIDRs: null + excludeCIDRs: null minSyncPeriod: 0s scheduler: "" syncPeriod: 30s diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml index 693080ec2d6..70ea5986e11 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml +++ b/cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml @@ -49,7 +49,7 @@ kubeProxy: minSyncPeriod: 0s syncPeriod: 30s ipvs: - ExcludeCIDRs: null + excludeCIDRs: null minSyncPeriod: 0s scheduler: "" syncPeriod: 30s diff --git a/cmd/kubeadm/app/util/config/testdata/v1alpha1_upgrade/after.yaml b/cmd/kubeadm/app/util/config/testdata/v1alpha1_upgrade/after.yaml index 045df0ad360..a08a94a5402 100644 --- a/cmd/kubeadm/app/util/config/testdata/v1alpha1_upgrade/after.yaml +++ b/cmd/kubeadm/app/util/config/testdata/v1alpha1_upgrade/after.yaml @@ -49,7 +49,7 @@ kubeProxy: minSyncPeriod: 0s syncPeriod: 30s ipvs: - ExcludeCIDRs: null + excludeCIDRs: null minSyncPeriod: 0s scheduler: "" syncPeriod: 30s diff --git a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go index c9936e701f7..beab095d605 100644 --- a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go +++ b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go @@ -65,7 +65,7 @@ type KubeProxyIPVSConfiguration struct { Scheduler string `json:"scheduler"` // excludeCIDRs is a list of CIDR's which the ipvs proxier should not touch // when cleaning up ipvs services. - ExcludeCIDRs []string + ExcludeCIDRs []string `json:"excludeCIDRs"` } // KubeProxyConntrackConfiguration contains conntrack settings for