From 820b7dfa1bcd19e45542e8919f004e75356a8ec9 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 19 Nov 2019 08:53:14 -0800 Subject: [PATCH 1/4] fix providerless build post-CSI migration --- .../app/plugins_providerless.go | 14 ++++++++------ cmd/kubelet/app/plugins_providerless.go | 10 +++++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cmd/kube-controller-manager/app/plugins_providerless.go b/cmd/kube-controller-manager/app/plugins_providerless.go index cd251593041..f0ded7da355 100644 --- a/cmd/kube-controller-manager/app/plugins_providerless.go +++ b/cmd/kube-controller-manager/app/plugins_providerless.go @@ -19,20 +19,22 @@ limitations under the License. package app import ( + "k8s.io/component-base/featuregate" + "k8s.io/kubernetes/pkg/volume" ) -func appendAttachableLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin { +func appendAttachableLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) { // no-op when compiled without legacy cloud providers - return allPlugins + return allPlugins, nil } -func appendExpandableLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin { +func appendExpandableLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) { // no-op when compiled without legacy cloud providers - return allPlugins + return allPlugins, nil } -func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin { +func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) { // no-op when compiled without legacy cloud providers - return allPlugins + return allPlugins, nil } diff --git a/cmd/kubelet/app/plugins_providerless.go b/cmd/kubelet/app/plugins_providerless.go index b73ae5a5d53..dc1bd3c07a7 100644 --- a/cmd/kubelet/app/plugins_providerless.go +++ b/cmd/kubelet/app/plugins_providerless.go @@ -18,9 +18,13 @@ limitations under the License. package app -import "k8s.io/kubernetes/pkg/volume" +import ( + "k8s.io/component-base/featuregate" -func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin) []volume.VolumePlugin { + "k8s.io/kubernetes/pkg/volume" +) + +func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) { // no-op when we didn't compile in support for these - return allPlugins + return allPlugins, nil } From b100bf965458860a91323fe3f9a3c5caaa9de8fb Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 19 Nov 2019 08:56:08 -0800 Subject: [PATCH 2/4] add providerless tags to new awsebs code --- pkg/volume/awsebs/attacher_linux.go | 1 + pkg/volume/awsebs/attacher_unsupported.go | 1 + pkg/volume/awsebs/attacher_windows.go | 1 + 3 files changed, 3 insertions(+) diff --git a/pkg/volume/awsebs/attacher_linux.go b/pkg/volume/awsebs/attacher_linux.go index 562a567ca34..43c5182d343 100644 --- a/pkg/volume/awsebs/attacher_linux.go +++ b/pkg/volume/awsebs/attacher_linux.go @@ -1,3 +1,4 @@ +// +build !providerless // +build linux /* diff --git a/pkg/volume/awsebs/attacher_unsupported.go b/pkg/volume/awsebs/attacher_unsupported.go index efbd78acf0c..e5874ad71b1 100644 --- a/pkg/volume/awsebs/attacher_unsupported.go +++ b/pkg/volume/awsebs/attacher_unsupported.go @@ -1,3 +1,4 @@ +// +build !providerless // +build !linux,!windows /* diff --git a/pkg/volume/awsebs/attacher_windows.go b/pkg/volume/awsebs/attacher_windows.go index e60d2999410..7d00e07a915 100644 --- a/pkg/volume/awsebs/attacher_windows.go +++ b/pkg/volume/awsebs/attacher_windows.go @@ -1,3 +1,4 @@ +// +build !providerless // +build windows /* From 753774d9eada3137144d9baa1f081055d72c75c7 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 19 Nov 2019 08:58:31 -0800 Subject: [PATCH 3/4] add providerless tag to vsphere volume code --- pkg/volume/vsphere_volume/vsphere_volume_util_linux.go | 1 + pkg/volume/vsphere_volume/vsphere_volume_util_unsupported.go | 1 + pkg/volume/vsphere_volume/vsphere_volume_util_windows.go | 1 + 3 files changed, 3 insertions(+) diff --git a/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go b/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go index 7e1efcc2c9c..3ad003b880f 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go @@ -1,3 +1,4 @@ +// +build !providerless // +build linux /* diff --git a/pkg/volume/vsphere_volume/vsphere_volume_util_unsupported.go b/pkg/volume/vsphere_volume/vsphere_volume_util_unsupported.go index 2f77a1bc64d..10de28ce16c 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_util_unsupported.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_util_unsupported.go @@ -1,3 +1,4 @@ +// +build !providerless // +build !linux,!windows /* diff --git a/pkg/volume/vsphere_volume/vsphere_volume_util_windows.go b/pkg/volume/vsphere_volume/vsphere_volume_util_windows.go index 5b075482563..a57b176371e 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_util_windows.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_util_windows.go @@ -1,3 +1,4 @@ +// +build !providerless // +build windows /* From cf510ac28527e731ebfe912f59ff549098b628a4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 19 Nov 2019 09:02:08 -0800 Subject: [PATCH 4/4] fix multiple node cidr masks in providerless build --- pkg/controller/nodeipam/nolegacyprovider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/nodeipam/nolegacyprovider.go b/pkg/controller/nodeipam/nolegacyprovider.go index e92da04bc98..ed43e8bea48 100644 --- a/pkg/controller/nodeipam/nolegacyprovider.go +++ b/pkg/controller/nodeipam/nolegacyprovider.go @@ -34,7 +34,7 @@ func startLegacyIPAM( kubeClient clientset.Interface, clusterCIDRs []*net.IPNet, serviceCIDR *net.IPNet, - nodeCIDRMaskSize int, + nodeCIDRMaskSizes []int, ) { klog.Fatal("Error trying to Init(): legacy cloud provider support disabled at build time") }