Merge pull request kubernetes#85456 from BenTheElder/fix-providerless

k8s-ci-robot · web-flow · commit c97baa339b50 · 2019-11-19T16:21:19.000-08:00
Fix providerless
diff --git 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
@@ -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
 }
diff --git 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")
 }
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+// +build !providerless
 // +build windows
 
 /*
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+// +build !providerless
 // +build windows
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func startLegacyIPAM(`
`34`	`34`	`kubeClient clientset.Interface,`
`35`	`35`	`clusterCIDRs []*net.IPNet,`
`36`	`36`	`serviceCIDR *net.IPNet,`
`37`		`- nodeCIDRMaskSize int,`
	`37`	`+ nodeCIDRMaskSizes []int,`
`38`	`38`	`) {`
`39`	`39`	`klog.Fatal("Error trying to Init(): legacy cloud provider support disabled at build time")`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// +build !providerless`
`1`	`2`	`// +build linux`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// +build !providerless`
`1`	`2`	`// +build !linux,!windows`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// +build !providerless`
`1`	`2`	`// +build windows`
`2`	`3`
`3`	`4`	`/*`