From 538255cec1c4a20742d85599325a0c055a4327d3 Mon Sep 17 00:00:00 2001
From: Prow Bot <prow@amazonaws.com>
Date: Thu, 13 Apr 2023 10:46:50 -0400
Subject: [PATCH] Remove Cloud Provider Builders Except Cluster API

Removes cloud builder dependency on cloud providers.
---
 .../cloudprovider/builder/builder_alicloud.go |  43 --------
 .../cloudprovider/builder/builder_all.go      | 104 ------------------
 .../cloudprovider/builder/builder_aws.go      |  43 --------
 .../cloudprovider/builder/builder_azure.go    |  43 --------
 .../builder/builder_baiducloud.go             |  43 --------
 .../builder/builder_bizflycloud.go            |  43 --------
 .../builder/builder_brightbox.go              |  43 --------
 .../cloudprovider/builder/builder_cherry.go   |  43 --------
 .../cloudprovider/builder/builder_civo.go     |  43 --------
 .../builder/builder_cloudstack.go             |  43 --------
 .../builder/builder_digitalocean.go           |  43 --------
 .../cloudprovider/builder/builder_exoscale.go |  43 --------
 .../builder/builder_externalgrpc.go           |  43 --------
 .../cloudprovider/builder/builder_gce.go      |  43 --------
 .../cloudprovider/builder/builder_hetzner.go  |  43 --------
 .../builder/builder_huaweicloud.go            |  43 --------
 .../builder/builder_ionoscloud.go             |  43 --------
 .../cloudprovider/builder/builder_kamatera.go |  43 --------
 .../cloudprovider/builder/builder_kubemark.go |  43 --------
 .../cloudprovider/builder/builder_linode.go   |  43 --------
 .../cloudprovider/builder/builder_magnum.go   |  43 --------
 .../cloudprovider/builder/builder_oci.go      |  43 --------
 .../cloudprovider/builder/builder_ovhcloud.go |  42 -------
 .../cloudprovider/builder/builder_packet.go   |  43 --------
 .../cloudprovider/builder/builder_rancher.go  |  43 --------
 .../cloudprovider/builder/builder_scaleway.go |  43 --------
 .../builder/builder_tencentcloud.go           |  43 --------
 .../cloudprovider/builder/builder_vultr.go    |  42 -------
 28 files changed, 1263 deletions(-)
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_aws.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_azure.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_cherry.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_civo.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_exoscale.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_externalgrpc.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_gce.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_hetzner.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_kamatera.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_kubemark.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_linode.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_magnum.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_oci.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_packet.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_rancher.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_scaleway.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_tencentcloud.go
 delete mode 100644 cluster-autoscaler/cloudprovider/builder/builder_vultr.go

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go b/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
deleted file mode 100644
index 38748c5f8..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build alicloud
-// +build alicloud
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.AlicloudProviderName,
-}
-
-// DefaultCloudProvider for alicloud-only build is alicloud.
-const DefaultCloudProvider = cloudprovider.AlicloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.AlicloudProviderName:
-		return alicloud.BuildAlicloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_all.go b/cluster-autoscaler/cloudprovider/builder/builder_all.go
index fd68a6e6c..3e38e30c1 100644
--- a/cluster-autoscaler/cloudprovider/builder/builder_all.go
+++ b/cluster-autoscaler/cloudprovider/builder/builder_all.go
@@ -21,65 +21,13 @@ package builder
 
 import (
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/bizflycloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/cherryservers"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/civo"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/cloudstack"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/clusterapi"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/digitalocean"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/exoscale"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/externalgrpc"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/gce"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/hetzner"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/ionoscloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/kamatera"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/linode"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/magnum"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/oci"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/ovhcloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/packet"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/rancher"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/scaleway"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/tencentcloud"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/vultr"
 	"k8s.io/autoscaler/cluster-autoscaler/config"
 )
 
 // AvailableCloudProviders supported by the cloud provider builder.
 var AvailableCloudProviders = []string{
-	cloudprovider.AwsProviderName,
-	cloudprovider.AzureProviderName,
-	cloudprovider.GceProviderName,
-	cloudprovider.AlicloudProviderName,
-	cloudprovider.CherryServersProviderName,
-	cloudprovider.CloudStackProviderName,
-	cloudprovider.BaiducloudProviderName,
-	cloudprovider.MagnumProviderName,
-	cloudprovider.DigitalOceanProviderName,
-	cloudprovider.ExoscaleProviderName,
-	cloudprovider.ExternalGrpcProviderName,
-	cloudprovider.HuaweicloudProviderName,
-	cloudprovider.HetznerProviderName,
-	cloudprovider.OracleCloudProviderName,
-	cloudprovider.OVHcloudProviderName,
 	cloudprovider.ClusterAPIProviderName,
-	cloudprovider.IonoscloudProviderName,
-	cloudprovider.KamateraProviderName,
-	cloudprovider.LinodeProviderName,
-	cloudprovider.BizflyCloudProviderName,
-	cloudprovider.BrightboxProviderName,
-	cloudprovider.PacketProviderName,
-	cloudprovider.VultrProviderName,
-	cloudprovider.TencentcloudProviderName,
-	cloudprovider.CivoProviderName,
-	cloudprovider.ScalewayProviderName,
-	cloudprovider.RancherProviderName,
 }
 
 // DefaultCloudProvider is GCE.
@@ -87,60 +35,8 @@ const DefaultCloudProvider = cloudprovider.GceProviderName
 
 func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
 	switch opts.CloudProviderName {
-	case cloudprovider.BizflyCloudProviderName:
-		return bizflycloud.BuildBizflyCloud(opts, do, rl)
-	case cloudprovider.GceProviderName:
-		return gce.BuildGCE(opts, do, rl)
-	case cloudprovider.AwsProviderName:
-		return aws.BuildAWS(opts, do, rl)
-	case cloudprovider.AzureProviderName:
-		return azure.BuildAzure(opts, do, rl)
-	case cloudprovider.AlicloudProviderName:
-		return alicloud.BuildAlicloud(opts, do, rl)
-	case cloudprovider.CherryServersProviderName:
-		return cherryservers.BuildCherry(opts, do, rl)
-	case cloudprovider.CloudStackProviderName:
-		return cloudstack.BuildCloudStack(opts, do, rl)
-	case cloudprovider.BaiducloudProviderName:
-		return baiducloud.BuildBaiducloud(opts, do, rl)
-	case cloudprovider.BrightboxProviderName:
-		return brightbox.BuildBrightbox(opts, do, rl)
-	case cloudprovider.DigitalOceanProviderName:
-		return digitalocean.BuildDigitalOcean(opts, do, rl)
-	case cloudprovider.ExoscaleProviderName:
-		return exoscale.BuildExoscale(opts, do, rl)
-	case cloudprovider.ExternalGrpcProviderName:
-		return externalgrpc.BuildExternalGrpc(opts, do, rl)
-	case cloudprovider.MagnumProviderName:
-		return magnum.BuildMagnum(opts, do, rl)
-	case cloudprovider.HuaweicloudProviderName:
-		return huaweicloud.BuildHuaweiCloud(opts, do, rl)
-	case cloudprovider.OVHcloudProviderName:
-		return ovhcloud.BuildOVHcloud(opts, do, rl)
-	case cloudprovider.HetznerProviderName:
-		return hetzner.BuildHetzner(opts, do, rl)
-	case cloudprovider.PacketProviderName:
-		return packet.BuildPacket(opts, do, rl)
 	case cloudprovider.ClusterAPIProviderName:
 		return clusterapi.BuildClusterAPI(opts, do, rl)
-	case cloudprovider.IonoscloudProviderName:
-		return ionoscloud.BuildIonosCloud(opts, do, rl)
-	case cloudprovider.KamateraProviderName:
-		return kamatera.BuildKamatera(opts, do, rl)
-	case cloudprovider.LinodeProviderName:
-		return linode.BuildLinode(opts, do, rl)
-	case cloudprovider.OracleCloudProviderName:
-		return oci.BuildOCI(opts, do, rl)
-	case cloudprovider.VultrProviderName:
-		return vultr.BuildVultr(opts, do, rl)
-	case cloudprovider.TencentcloudProviderName:
-		return tencentcloud.BuildTencentcloud(opts, do, rl)
-	case cloudprovider.CivoProviderName:
-		return civo.BuildCivo(opts, do, rl)
-	case cloudprovider.ScalewayProviderName:
-		return scaleway.BuildScaleway(opts, do, rl)
-	case cloudprovider.RancherProviderName:
-		return rancher.BuildRancher(opts, do, rl)
 	}
 	return nil
 }
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_aws.go b/cluster-autoscaler/cloudprovider/builder/builder_aws.go
deleted file mode 100644
index f1258215d..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_aws.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build aws
-// +build aws
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.AwsProviderName,
-}
-
-// DefaultCloudProvider for AWS-only build is AWS.
-const DefaultCloudProvider = cloudprovider.AwsProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.AwsProviderName:
-		return aws.BuildAWS(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_azure.go b/cluster-autoscaler/cloudprovider/builder/builder_azure.go
deleted file mode 100644
index 06e2d6b3a..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_azure.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build azure
-// +build azure
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.AzureProviderName,
-}
-
-// DefaultCloudProvider on Azure-only build is Azure.
-const DefaultCloudProvider = cloudprovider.AzureProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.AzureProviderName:
-		return azure.BuildAzure(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go b/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
deleted file mode 100644
index 61645c019..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build baiducloud
-// +build baiducloud
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.BaiducloudProviderName,
-}
-
-// DefaultCloudProvider for baiducloud-only build is baiducloud.
-const DefaultCloudProvider = cloudprovider.BaiducloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.BaiducloudProviderName:
-		return baiducloud.BuildBaiducloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go b/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
deleted file mode 100644
index 6d9739aa0..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build bizflycloud
-// +build bizflycloud
-
-/*
-Copyright 2021 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/bizflycloud"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the Bizflycloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.BizflyCloudProviderName,
-}
-
-// DefaultCloudProvider build is Bizflycloud..
-const DefaultCloudProvider = cloudprovider.BizflyCloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.BizflyCloudProviderName:
-		return bizflycloud.BuildBizflyCloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go b/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
deleted file mode 100644
index 2445edbb5..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build brightbox
-// +build brightbox
-
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the brightbox cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.BrightboxProviderName,
-}
-
-// DefaultCloudProvider is Brightbox
-const DefaultCloudProvider = cloudprovider.BrightboxProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.BrightboxProviderName:
-		return brightbox.BuildBrightbox(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_cherry.go b/cluster-autoscaler/cloudprovider/builder/builder_cherry.go
deleted file mode 100644
index 4f16b8b90..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_cherry.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build cherry
-// +build cherry
-
-/*
-Copyright 2022 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	cherry "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/cherryservers"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cherry.ProviderName,
-}
-
-// DefaultCloudProvider for Cherry-only build is Cherry
-const DefaultCloudProvider = cherry.ProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cherry.ProviderName:
-		return cherry.BuildCherry(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_civo.go b/cluster-autoscaler/cloudprovider/builder/builder_civo.go
deleted file mode 100644
index 24cf7c9ab..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_civo.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build civo
-// +build civo
-
-/*
-Copyright 2022 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/civo"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the digtalocean cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.CivoProviderName,
-}
-
-// DefaultCloudProvider for civo-only build is Civo.
-const DefaultCloudProvider = cloudprovider.CivoProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.CivoProviderName:
-		return civo.BuildCivo(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go b/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
deleted file mode 100644
index 3090faf15..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build cloudstack
-// +build cloudstack
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/cloudstack"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.CloudStackProviderName,
-}
-
-// DefaultCloudProvider for cloudstack-only build is cloudstack.
-const DefaultCloudProvider = cloudprovider.CloudStackProviderName
-
-func BuildCloudStack(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.CloudStackProviderName:
-		return cloudstack.BuildCloudStack(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go b/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
deleted file mode 100644
index 00dcfb212..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build digitalocean
-// +build digitalocean
-
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/digitalocean"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the digtalocean cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.DigitalOceanProviderName,
-}
-
-// DefaultCloudProvider for do-only build is DigitalOcean.
-const DefaultCloudProvider = cloudprovider.DigitalOceanProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.DigitalOceanProviderName:
-		return digitalocean.BuildDigitalOcean(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go b/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go
deleted file mode 100644
index 5454ecaa6..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build exoscale
-// +build exoscale
-
-/*
-Copyright 2021 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/exoscale"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the Exoscale cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.ExoscaleProviderName,
-}
-
-// DefaultCloudProvider is Exoscale.
-const DefaultCloudProvider = cloudprovider.ExoscaleProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.ExoscaleProviderName:
-		return exoscale.BuildExoscale(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_externalgrpc.go b/cluster-autoscaler/cloudprovider/builder/builder_externalgrpc.go
deleted file mode 100644
index 5c2e8b574..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_externalgrpc.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build externalgrpc
-// +build externalgrpc
-
-/*
-Copyright 2022 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/externalgrpc"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.ExternalGrpcProviderName,
-}
-
-// DefaultCloudProvider for externalgrpc-only build is externalgrpc.
-const DefaultCloudProvider = cloudprovider.ExternalGrpcProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.ExternalGrpcProviderName:
-		return externalgrpc.BuildExternalGrpc(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_gce.go b/cluster-autoscaler/cloudprovider/builder/builder_gce.go
deleted file mode 100644
index d4fbc93a2..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_gce.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build gce
-// +build gce
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/gce"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.GceProviderName,
-}
-
-// DefaultCloudProvider is GCE.
-const DefaultCloudProvider = cloudprovider.GceProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.GceProviderName:
-		return gce.BuildGCE(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go b/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go
deleted file mode 100644
index 156a132c4..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build hetzner
-// +build hetzner
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/hetzner"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the Hetzner cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.HetznerProviderName,
-}
-
-// DefaultCloudProvider is Hetzner.
-const DefaultCloudProvider = cloudprovider.HetznerProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.HetznerProviderName:
-		return hetzner.BuildHetzner(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go b/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go
deleted file mode 100644
index 7b7b1dc7b..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build huaweicloud
-// +build huaweicloud
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.HuaweicloudProviderName,
-}
-
-// DefaultCloudProvider for huaweicloud-only build is huaweicloud.
-const DefaultCloudProvider = cloudprovider.HuaweicloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.HuaweicloudProviderName:
-		return huaweicloud.BuildHuaweiCloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go
deleted file mode 100644
index 3ddfcafa5..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build ionoscloud
-// +build ionoscloud
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/ionoscloud"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.IonoscloudProviderName,
-}
-
-// DefaultCloudProvider for IonosCloud-only build is ionoscloud.
-const DefaultCloudProvider = cloudprovider.IonoscloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.IonoscloudProviderName:
-		return ionoscloud.BuildIonosCloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_kamatera.go b/cluster-autoscaler/cloudprovider/builder/builder_kamatera.go
deleted file mode 100644
index 968962961..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_kamatera.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build kamatera
-// +build kamatera
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/kamatera"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the Kamaterea cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.KamateraProviderName,
-}
-
-// DefaultCloudProvider is Kamatera.
-const DefaultCloudProvider = cloudprovider.KamateraProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.KamateraProviderName:
-		return kamatera.BuildKamatera(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go b/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go
deleted file mode 100644
index 5ad33d38c..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build kubemark
-// +build kubemark
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/kubemark"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.KubemarkProviderName,
-}
-
-// DefaultCloudProvider for Kubemark-only build is Kubemark.
-const DefaultCloudProvider = cloudprovider.KubemarkProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.KubemarkProviderName:
-		return kubemark.BuildKubemark(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_linode.go b/cluster-autoscaler/cloudprovider/builder/builder_linode.go
deleted file mode 100644
index cb3856a06..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_linode.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build linode
-// +build linode
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/linode"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.LinodeProviderName,
-}
-
-// DefaultCloudProvider for linode-only build is linode.
-const DefaultCloudProvider = cloudprovider.LinodeProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.LinodeProviderName:
-		return linode.BuildLinode(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_magnum.go b/cluster-autoscaler/cloudprovider/builder/builder_magnum.go
deleted file mode 100644
index 796987310..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_magnum.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build magnum
-// +build magnum
-
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/magnum"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.MagnumProviderName,
-}
-
-// DefaultCloudProvider for OpenStack-only build is OpenStack.
-const DefaultCloudProvider = cloudprovider.MagnumProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.MagnumProviderName:
-		return magnum.BuildMagnum(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_oci.go b/cluster-autoscaler/cloudprovider/builder/builder_oci.go
deleted file mode 100644
index 55756f147..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_oci.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build oci
-// +build oci
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/oci"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.OracleCloudProviderName,
-}
-
-// DefaultCloudProvider for oci-only build is oci.
-const DefaultCloudProvider = cloudprovider.OracleCloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.OracleCloudProviderName:
-		return oci.BuildOCI(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
deleted file mode 100644
index 680cdc55c..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
+++ /dev/null
@@ -1,42 +0,0 @@
-//go:build exoscale
-// +build exoscale
-
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the Hetzner cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.OVHcloudProviderName,
-}
-
-// DefaultCloudProvider is OVHcloud.
-const DefaultCloudProvider = cloudprovider.OVHcloudProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.OVHcloudProviderName:
-		return ovhcloud.BuildOVHcloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_packet.go b/cluster-autoscaler/cloudprovider/builder/builder_packet.go
deleted file mode 100644
index 403eba21d..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_packet.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build packet
-// +build packet
-
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/packet"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	packet.ProviderName,
-}
-
-// DefaultCloudProvider for Packet-only build is Packet.
-const DefaultCloudProvider = packet.ProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case packet.ProviderName:
-		return packet.BuildPacket(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_rancher.go b/cluster-autoscaler/cloudprovider/builder/builder_rancher.go
deleted file mode 100644
index ee8019e21..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_rancher.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build rancher
-// +build rancher
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/rancher"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.RancherProviderName,
-}
-
-// DefaultCloudProvider for rancher-only build is rancher.
-const DefaultCloudProvider = cloudprovider.RancherProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.RancherProviderName:
-		return rancher.BuildRancher(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_scaleway.go b/cluster-autoscaler/cloudprovider/builder/builder_scaleway.go
deleted file mode 100644
index 558fb3e0a..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_scaleway.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build scaleway
-// +build scaleway
-
-/*
-Copyright 2022 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/scaleway"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the scaleway cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.ScalewayProviderName,
-}
-
-// DefaultCloudProvider for do-only build is Scaleway.
-const DefaultCloudProvider = cloudprovider.ScalewayProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.ScalewayProviderName:
-		return scaleway.BuildScaleway(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_tencentcloud.go b/cluster-autoscaler/cloudprovider/builder/builder_tencentcloud.go
deleted file mode 100644
index f8c8e9f19..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_tencentcloud.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build tencentcloud
-// +build tencentcloud
-
-/*
-Copyright 2021 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/tencentcloud"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.TencentcloudProviderName,
-}
-
-// DefaultCloudProvider is TKE.
-const DefaultCloudProvider = cloudprovider.TkeProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.TencentcloudProviderName:
-		return tencentcloud.BuildTencentcloud(opts, do, rl)
-	}
-
-	return nil
-}
diff --git a/cluster-autoscaler/cloudprovider/builder/builder_vultr.go b/cluster-autoscaler/cloudprovider/builder/builder_vultr.go
deleted file mode 100644
index e6c20b814..000000000
--- a/cluster-autoscaler/cloudprovider/builder/builder_vultr.go
+++ /dev/null
@@ -1,42 +0,0 @@
-//go:build vultr
-// +build vultr
-
-/*
-Copyright 2022 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package builder
-
-import (
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
-	"k8s.io/autoscaler/cluster-autoscaler/config"
-)
-
-// AvailableCloudProviders supported by the cloud provider builder.
-var AvailableCloudProviders = []string{
-	cloudprovider.VultrProviderName,
-}
-
-// DefaultCloudProvider for linode-only build is linode.
-const DefaultCloudProvider = cloudprovider.VultrProviderName
-
-func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
-	switch opts.CloudProviderName {
-	case cloudprovider.VultrProviderName:
-		return vultr.BuildLinode(opts, do, rl)
-	}
-
-	return nil
-}
-- 
2.37.1 (Apple Git-137.1)