From cff8562c187f99ff41fab4b4c7109c9c6beb2171 Mon Sep 17 00:00:00 2001 From: cici37 Date: Tue, 7 Jul 2020 11:43:27 -0700 Subject: [PATCH] Import cloud provider from k8s.io/legacy-cloud-provider --- cmd/cloud-controller-manager/BUILD | 6 +++++- cmd/cloud-controller-manager/controller-manager.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index b9ff93fccdf..25ca34efcd2 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -20,10 +20,14 @@ go_library( importpath = "k8s.io/kubernetes/cmd/cloud-controller-manager", deps = [ "//cmd/cloud-controller-manager/app:go_default_library", - "//pkg/cloudprovider/providers:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/openstack:go_default_library", + "//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library", ], ) diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index eb9c6698938..e2d81b2d668 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -31,7 +31,11 @@ import ( // NOTE: Importing all in-tree cloud-providers is not required when // implementing an out-of-tree cloud-provider. _ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins - _ "k8s.io/kubernetes/pkg/cloudprovider/providers" + _ "k8s.io/legacy-cloud-providers/aws" + _ "k8s.io/legacy-cloud-providers/azure" + _ "k8s.io/legacy-cloud-providers/gce" + _ "k8s.io/legacy-cloud-providers/openstack" + _ "k8s.io/legacy-cloud-providers/vsphere" ) func main() {