Skip to content

Commit bfc9b09

Browse files
authored
Merge pull request kubernetes#3331 from MaciekPytel/revert_huawei
Revert "Merge pull request kubernetes#3099 from ysy2020/cluster-autoscaler-huaw…
2 parents 84cbb3b + f35dcfa commit bfc9b09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1
-8667
lines changed

cluster-autoscaler/cloudprovider/builder/builder_all.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi,!huaweicloud
1+
// +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi
22

33
/*
44
Copyright 2018 The Kubernetes Authors.
@@ -27,7 +27,6 @@ import (
2727
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/clusterapi"
2828
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/digitalocean"
2929
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/gce"
30-
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud"
3130
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/magnum"
3231
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/packet"
3332
"k8s.io/autoscaler/cluster-autoscaler/config"
@@ -42,7 +41,6 @@ var AvailableCloudProviders = []string{
4241
cloudprovider.BaiducloudProviderName,
4342
cloudprovider.MagnumProviderName,
4443
cloudprovider.DigitalOceanProviderName,
45-
cloudprovider.HuaweicloudProviderName,
4644
clusterapi.ProviderName,
4745
}
4846

@@ -65,8 +63,6 @@ func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGro
6563
return digitalocean.BuildDigitalOcean(opts, do, rl)
6664
case cloudprovider.MagnumProviderName:
6765
return magnum.BuildMagnum(opts, do, rl)
68-
case cloudprovider.HuaweicloudProviderName:
69-
return huaweicloud.BuildHuaweiCloud(opts, do, rl)
7066
case packet.ProviderName:
7167
return packet.BuildPacket(opts, do, rl)
7268
case clusterapi.ProviderName:

cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go

Lines changed: 0 additions & 42 deletions
This file was deleted.

cluster-autoscaler/cloudprovider/cloud_provider.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ const (
4343
MagnumProviderName = "magnum"
4444
// KubemarkProviderName gets the provider name of kubemark
4545
KubemarkProviderName = "kubemark"
46-
// HuaweicloudProviderName gets the provider name of huaweicloud
47-
HuaweicloudProviderName = "huaweicloud"
4846
)
4947

5048
// CloudProvider contains configuration info and functions for interacting with

cluster-autoscaler/cloudprovider/huaweicloud/README.md

Lines changed: 0 additions & 229 deletions
This file was deleted.

cluster-autoscaler/cloudprovider/huaweicloud/examples/cluster-autoscaler-deployment.yaml

Lines changed: 0 additions & 41 deletions
This file was deleted.

cluster-autoscaler/cloudprovider/huaweicloud/examples/cluster-autoscaler-secret.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)