Skip to content

Commit 633ab1c

Browse files
authored
Merge pull request kubernetes#92880 from cici37/importCloudProvider
Import cloud provider from k8s.io/legacy-cloud-provider
2 parents 01f98c4 + cff8562 commit 633ab1c

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

cmd/cloud-controller-manager/BUILD

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ go_library(
2020
importpath = "k8s.io/kubernetes/cmd/cloud-controller-manager",
2121
deps = [
2222
"//cmd/cloud-controller-manager/app:go_default_library",
23-
"//pkg/cloudprovider/providers:go_default_library",
2423
"//staging/src/k8s.io/component-base/logs:go_default_library",
2524
"//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library",
2625
"//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",
26+
"//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library",
27+
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
28+
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
29+
"//staging/src/k8s.io/legacy-cloud-providers/openstack:go_default_library",
30+
"//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library",
2731
],
2832
)
2933

cmd/cloud-controller-manager/controller-manager.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ import (
3131
// NOTE: Importing all in-tree cloud-providers is not required when
3232
// implementing an out-of-tree cloud-provider.
3333
_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins
34-
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
34+
_ "k8s.io/legacy-cloud-providers/aws"
35+
_ "k8s.io/legacy-cloud-providers/azure"
36+
_ "k8s.io/legacy-cloud-providers/gce"
37+
_ "k8s.io/legacy-cloud-providers/openstack"
38+
_ "k8s.io/legacy-cloud-providers/vsphere"
3539
)
3640

3741
func main() {

0 commit comments

Comments
 (0)