From 7733f5aa50e3f8ea3fcdc6780eb3e5e714fe0985 Mon Sep 17 00:00:00 2001 From: Walter Fender Date: Wed, 6 Sep 2017 13:47:24 -0700 Subject: [PATCH] Fix failure to load volume plugins for #52048 Currently we have two plugin managers. However one of them limits the cloud plugins it loads. This means that if cloud provider is set to external the plugins will not be loaded in *that* plugin manager. However they will be loaded in the other instance of the plugin manager. So it does not actually save us anything. It does hamper the efforts to actually get stage 1 separation working. --- cmd/kube-controller-manager/app/BUILD | 6 ----- cmd/kube-controller-manager/app/plugins.go | 28 +++++----------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index 92fadcacf54..0f7f510fb85 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -41,12 +41,6 @@ go_library( "//pkg/apis/storage/install:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers:go_default_library", - "//pkg/cloudprovider/providers/aws:go_default_library", - "//pkg/cloudprovider/providers/azure:go_default_library", - "//pkg/cloudprovider/providers/gce:go_default_library", - "//pkg/cloudprovider/providers/openstack:go_default_library", - "//pkg/cloudprovider/providers/photon:go_default_library", - "//pkg/cloudprovider/providers/vsphere:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/bootstrap:go_default_library", "//pkg/controller/certificates/approver:go_default_library", diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go index f26ab264cef..41b0d28f809 100644 --- a/cmd/kube-controller-manager/app/plugins.go +++ b/cmd/kube-controller-manager/app/plugins.go @@ -30,12 +30,6 @@ import ( // Volume plugins "github.com/golang/glog" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" - "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" - "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" - "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack" - "k8s.io/kubernetes/pkg/cloudprovider/providers/photon" - "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/aws_ebs" "k8s.io/kubernetes/pkg/volume/azure_dd" @@ -135,22 +129,12 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen allPlugins = append(allPlugins, local.ProbeVolumePlugins()...) allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...) - if cloud != nil { - switch { - case aws.ProviderName == cloud.ProviderName(): - allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...) - case gce.ProviderName == cloud.ProviderName(): - allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...) - case openstack.ProviderName == cloud.ProviderName(): - allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...) - case vsphere.ProviderName == cloud.ProviderName(): - allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...) - case azure.CloudProviderName == cloud.ProviderName(): - allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) - case photon.ProviderName == cloud.ProviderName(): - allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...) - } - } + allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...) return allPlugins }