Skip to content

WIP DO NOT MERGE Ocp4.18 57131 60790 x logs #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: release-4.18
Choose a base branch
from
Draft

WIP DO NOT MERGE Ocp4.18 57131 60790 x logs #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae0d6ad
refactor core.AutoscalerOptions in a new package
elmiko Sep 26, 2025
0e8554f
refactor NewCloudProvider to accept AutoscalerOptions
elmiko Sep 26, 2025
071ad4c
add scale down registration method
elmiko Sep 26, 2025
98eb4cd
add clusterapi scale down upgrade processor
elmiko Sep 8, 2025
ae90242
add logs to FitsAnyNodeMatching
elmiko Jul 10, 2025
5c0c0ff
add more logging to RunOnce
elmiko Jul 10, 2025
d9edc8f
WIP add more logging to SchedulablePodGroups
elmiko Sep 17, 2025
43adc06
update node info processor to include unschedulable nodes
elmiko Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/alicloud/alicloud_cloud_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/config"
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
klog "k8s.io/klog/v2"
Expand Down Expand Up @@ -220,7 +220,7 @@ func buildAsg(manager *AliCloudManager, minSize int, maxSize int, id string, reg
}

// BuildAlicloud returns alicloud provider
func BuildAlicloud(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
func BuildAlicloud(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
var aliManager *AliCloudManager
var aliError error
if opts.CloudConfig != "" {
Expand Down
3 changes: 2 additions & 1 deletion cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
klog "k8s.io/klog/v2"
Expand Down Expand Up @@ -408,7 +409,7 @@ func (ng *AwsNodeGroup) TemplateNodeInfo() (*schedulerframework.NodeInfo, error)
}

// BuildAWS builds AWS cloud provider, manager etc.
func BuildAWS(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
func BuildAWS(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
var cfg io.ReadCloser
if opts.CloudConfig != "" {
var err error
Expand Down
7 changes: 4 additions & 3 deletions cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ package aws

import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/autoscaling"
"k8s.io/autoscaler/cluster-autoscaler/config"
"testing"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
)

var testAwsManager = &AwsManager{
Expand Down Expand Up @@ -132,7 +133,7 @@ func TestInstanceTypeFallback(t *testing.T) {
map[string]int64{cloudprovider.ResourceNameCores: 10, cloudprovider.ResourceNameMemory: 100000000})

do := cloudprovider.NodeGroupDiscoveryOptions{}
opts := config.AutoscalingOptions{}
opts := &coreoptions.AutoscalerOptions{}

t.Setenv("AWS_REGION", "non-existent-region")

Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/azure/azure_cloud_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
klog "k8s.io/klog/v2"
Expand Down Expand Up @@ -190,7 +190,7 @@ func (m *azureRef) String() string {
}

// BuildAzure builds Azure cloud provider, manager etc.
func BuildAzure(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
func BuildAzure(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
var config io.ReadCloser
if opts.CloudConfig != "" {
klog.Infof("Creating Azure Manager using cloud-config file: %v", opts.CloudConfig)
Expand Down
3 changes: 2 additions & 1 deletion cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/config"
"k8s.io/autoscaler/cluster-autoscaler/config/dynamic"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
klog "k8s.io/klog/v2"
Expand Down Expand Up @@ -56,7 +57,7 @@ type baiducloudCloudProvider struct {
}

// BuildBaiducloud builds baiducloud cloud provider, manager etc.
func BuildBaiducloud(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
func BuildBaiducloud(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
var cfg io.ReadCloser
if opts.CloudConfig != "" {
var err error
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/bizflycloud/bizflycloud_cloud_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
klog "k8s.io/klog/v2"
Expand Down Expand Up @@ -174,7 +174,7 @@ func (d *bizflycloudCloudProvider) Refresh() error {

// BuildBizflyCloud builds the Bizflycloud cloud provider.
func BuildBizflyCloud(
opts config.AutoscalingOptions,
opts *coreoptions.AutoscalerOptions,
do cloudprovider.NodeGroupDiscoveryOptions,
rl *cloudprovider.ResourceLimiter,
) cloudprovider.CloudProvider {
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/brightbox/brightbox_cloud_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
brightbox "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox/gobrightbox"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox/gobrightbox/status"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox/k8ssdk"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
klog "k8s.io/klog/v2"
Expand Down Expand Up @@ -221,7 +221,7 @@ func (b *brightboxCloudProvider) Cleanup() error {

// BuildBrightbox builds the Brightbox provider
func BuildBrightbox(
opts config.AutoscalingOptions,
opts *coreoptions.AutoscalerOptions,
do cloudprovider.NodeGroupDiscoveryOptions,
rl *cloudprovider.ResourceLimiter,
) cloudprovider.CloudProvider {
Expand Down
15 changes: 10 additions & 5 deletions cluster-autoscaler/cloudprovider/brightbox/brightbox_cloud_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox/k8ssdk"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox/k8ssdk/mocks"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
klog "k8s.io/klog/v2"
)

Expand Down Expand Up @@ -138,9 +139,11 @@ func TestBuildBrightBox(t *testing.T) {
defer ts.Close()
rl := cloudprovider.NewResourceLimiter(nil, nil)
do := cloudprovider.NodeGroupDiscoveryOptions{}
opts := config.AutoscalingOptions{
CloudProviderName: cloudprovider.BrightboxProviderName,
ClusterName: fakeClusterName,
opts := &coreoptions.AutoscalerOptions{
AutoscalingOptions: config.AutoscalingOptions{
CloudProviderName: cloudprovider.BrightboxProviderName,
ClusterName: fakeClusterName,
},
}
cloud := BuildBrightbox(opts, do, rl)
assert.Equal(t, cloud.Name(), cloudprovider.BrightboxProviderName)
Expand Down Expand Up @@ -170,8 +173,10 @@ func TestBuildBrightboxMissingClusterName(t *testing.T) {
defer ts.Close()
rl := cloudprovider.NewResourceLimiter(nil, nil)
do := cloudprovider.NodeGroupDiscoveryOptions{}
opts := config.AutoscalingOptions{
CloudProviderName: cloudprovider.BrightboxProviderName,
opts := &coreoptions.AutoscalerOptions{
AutoscalingOptions: config.AutoscalingOptions{
CloudProviderName: cloudprovider.BrightboxProviderName,
},
}
BuildBrightbox(opts, do, rl)
})
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/alicloud"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for alicloud-only build is alicloud.
const DefaultCloudProvider = cloudprovider.AlicloudProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.AlicloudProviderName:
return alicloud.BuildAlicloud(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_all.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/tencentcloud"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/volcengine"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/vultr"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand Down Expand Up @@ -90,7 +90,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider is GCE.
const DefaultCloudProvider = cloudprovider.GceProviderName

func buildCloudProvider(opts config.AutoscalingOptions,
func buildCloudProvider(opts *coreoptions.AutoscalerOptions,
do cloudprovider.NodeGroupDiscoveryOptions,
rl *cloudprovider.ResourceLimiter,
informerFactory informers.SharedInformerFactory) cloudprovider.CloudProvider {
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for AWS-only build is AWS.
const DefaultCloudProvider = cloudprovider.AwsProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.AwsProviderName:
return aws.BuildAWS(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider on Azure-only build is Azure.
const DefaultCloudProvider = cloudprovider.AzureProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.AzureProviderName:
return azure.BuildAzure(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/baiducloud"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for baiducloud-only build is baiducloud.
const DefaultCloudProvider = cloudprovider.BaiducloudProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.BaiducloudProviderName:
return baiducloud.BuildBaiducloud(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/bizflycloud"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider build is Bizflycloud..
const DefaultCloudProvider = cloudprovider.BizflyCloudProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.BizflyCloudProviderName:
return bizflycloud.BuildBizflyCloud(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/brightbox"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider is Brightbox
const DefaultCloudProvider = cloudprovider.BrightboxProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.BrightboxProviderName:
return brightbox.BuildBrightbox(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_cherry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
cherry "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/cherryservers"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for Cherry-only build is Cherry
const DefaultCloudProvider = cherry.ProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cherry.ProviderName:
return cherry.BuildCherry(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_civo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/civo"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for civo-only build is Civo.
const DefaultCloudProvider = cloudprovider.CivoProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.CivoProviderName:
return civo.BuildCivo(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/cloudstack"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for cloudstack-only build is cloudstack.
const DefaultCloudProvider = cloudprovider.CloudStackProviderName

func BuildCloudStack(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func BuildCloudStack(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.CloudStackProviderName:
return cloudstack.BuildCloudStack(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/clusterapi"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for machineapi-only build.
const DefaultCloudProvider = cloudprovider.ClusterAPIProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.ClusterAPIProviderName:
return clusterapi.BuildClusterAPI(opts, do, rl)
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package builder
import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/digitalocean"
"k8s.io/autoscaler/cluster-autoscaler/config"
coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options"
"k8s.io/client-go/informers"
)

Expand All @@ -34,7 +34,7 @@ var AvailableCloudProviders = []string{
// DefaultCloudProvider for do-only build is DigitalOcean.
const DefaultCloudProvider = cloudprovider.DigitalOceanProviderName

func buildCloudProvider(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
func buildCloudProvider(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, _ informers.SharedInformerFactory) cloudprovider.CloudProvider {
switch opts.CloudProviderName {
case cloudprovider.DigitalOceanProviderName:
return digitalocean.BuildDigitalOcean(opts, do, rl)
Expand Down
Loading