Skip to content

Commit

Permalink
Merge pull request #1866 from frobware/clusterapi-cloudprovider
Browse files Browse the repository at this point in the history
Add cluster-api based cloudprovider
  • Loading branch information
k8s-ci-robot authored Mar 12, 2020
2 parents 350e4a9 + 3955223 commit 150bf34
Show file tree
Hide file tree
Showing 32 changed files with 5,748 additions and 39 deletions.
6 changes: 5 additions & 1 deletion cluster-autoscaler/cloudprovider/builder/builder_all.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean
// +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi

/*
Copyright 2018 The Kubernetes Authors.
Expand All @@ -24,6 +24,7 @@ import (
"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/clusterapi"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/digitalocean"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/gce"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/magnum"
Expand All @@ -40,6 +41,7 @@ var AvailableCloudProviders = []string{
cloudprovider.BaiducloudProviderName,
cloudprovider.MagnumProviderName,
cloudprovider.DigitalOceanProviderName,
clusterapi.ProviderName,
}

// DefaultCloudProvider is GCE.
Expand All @@ -63,6 +65,8 @@ func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGro
return magnum.BuildMagnum(opts, do, rl)
case packet.ProviderName:
return packet.BuildPacket(opts, do, rl)
case clusterapi.ProviderName:
return clusterapi.BuildClusterAPI(opts, do, rl)
}
return nil
}
42 changes: 42 additions & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// +build clusterapi

/*
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/clusterapi"
"k8s.io/autoscaler/cluster-autoscaler/config"
)

// AvailableCloudProviders supported by the cloud provider builder.
var AvailableCloudProviders = []string{
clusterapi.ProviderName,
}

// DefaultCloudProvider for machineapi-only build.
const DefaultCloudProvider = clusterapi.ProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case clusterapi.ProviderName:
return clusterapi.BuildClusterAPI(opts, do, rl)
}

return nil
}
14 changes: 14 additions & 0 deletions cluster-autoscaler/cloudprovider/clusterapi/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
approvers:
- frobware
- enxebre
- elmiko
- hardikdr
- detiber
- ncdc
reviewers:
- frobware
- enxebre
- elmiko
- hardikdr
- detiber
- ncdc
Loading

0 comments on commit 150bf34

Please sign in to comment.