-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Refactor cloud provider builder into a dynamic registration pattern #9639
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.
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
Open
Choraden
wants to merge
1
commit into
kubernetes:master
Choose a base branch
from
Choraden:register-pattern-for-providers
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| 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 ( | ||
| "sort" | ||
|
|
||
| "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||
| coreoptions "k8s.io/autoscaler/cluster-autoscaler/core/options" | ||
| "k8s.io/client-go/informers" | ||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| // CloudProviderBuilder builds a cloud provider from provided parameters. | ||
| type CloudProviderBuilder func(opts *coreoptions.AutoscalerOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, informerFactory informers.SharedInformerFactory) cloudprovider.CloudProvider | ||
|
|
||
| var ( | ||
| cloudProviderBuilders = make(map[string]CloudProviderBuilder) | ||
| defaultCloudProvider string | ||
| ) | ||
|
|
||
| // RegisterCloudProvider registers a cloud provider builder. | ||
| func RegisterCloudProvider(name string, builder CloudProviderBuilder) { | ||
| if _, ok := cloudProviderBuilders[name]; ok { | ||
| klog.Fatalf("Cloud provider %s already registered", name) | ||
| } | ||
| cloudProviderBuilders[name] = builder | ||
| } | ||
|
|
||
| // GetCloudProviderBuilder returns a cloud provider builder by name. | ||
| func GetCloudProviderBuilder(name string) (CloudProviderBuilder, bool) { | ||
| builder, ok := cloudProviderBuilders[name] | ||
| return builder, ok | ||
| } | ||
|
|
||
| // AvailableCloudProviders returns the list of supported cloud providers. | ||
| func AvailableCloudProviders() []string { | ||
| providers := make([]string, 0, len(cloudProviderBuilders)) | ||
| for name := range cloudProviderBuilders { | ||
| providers = append(providers, name) | ||
| } | ||
| sort.Strings(providers) | ||
| return providers | ||
| } | ||
|
|
||
| // SetDefaultCloudProvider sets the default cloud provider name. | ||
| func SetDefaultCloudProvider(name string) { | ||
| defaultCloudProvider = name | ||
| } | ||
|
|
||
| // GetDefaultCloudProvider returns the default cloud provider name. | ||
| func GetDefaultCloudProvider() string { | ||
| return defaultCloudProvider | ||
| } | ||
|
|
||
| // DefaultCloudProvider returns the default cloud provider name. | ||
| func DefaultCloudProvider() string { | ||
| if def := GetDefaultCloudProvider(); def != "" { | ||
| return def | ||
| } | ||
| return cloudprovider.GceProviderName | ||
| } | ||
44 changes: 0 additions & 44 deletions
44
cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like we lost setting the default provider in the flow with provider-specific tags. It seems like we could restore it pretty easily:
init()functions incloudprovider/<provider_name>, add aSetDefaultCloudProvider()call. This preserves the previous behavior of not having to pass the cloud provider flag if you build with a provider-specific tag.router_all.go, add aninit()function that callsSetDefaultCloudProvider(gce)to preserve the GCE default when you build with no tags.WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
One thing to notice about this approach is the order of initialization of packages. We need the router package and effectively all cloud providers to be initialized before flags, so that the default cloud provider and available ones is initialized:
Fortunately, the import path of the router (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/router") is before the path of the flags ("k8s.io/autoscaler/cluster-autoscaler/config/flags") in the lexical order.