From 820b7dfa1bcd19e45542e8919f004e75356a8ec9 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 19 Nov 2019 08:53:14 -0800 Subject: [PATCH] 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 }