github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

remove IsDeprecatedInternal from cloudprovider.plugins

Browse Source 
The internal cloud controller loops are disabled at this point, this
function should not be used as it does not return accurate information.
In its place we check for the presence of the external cloud provider as
that is the only acceptable value.
This commit is contained in:
elmiko 2024-09-26 14:55:16 -04:00
parent ff391cefe2
commit d1d05d3eba
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/cloudproviders.go
View File

@ -35,7 +35,7 @@ func createCloudProvider(logger klog.Logger, cloudProvider string, externalCloud
var loopMode ControllerLoopMode var loopMode ControllerLoopMode
var err error var err error
if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) && cloudprovider.IsDeprecatedInternal(cloudProvider) { if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) && !cloudprovider.IsExternal(cloudProvider) {
cloudprovider.DisableWarningForProvider(cloudProvider) cloudprovider.DisableWarningForProvider(cloudProvider)
return nil, ExternalLoops, fmt.Errorf( return nil, ExternalLoops, fmt.Errorf(
"cloud provider %q was specified, but built-in cloud providers are disabled. Please set --cloud-provider=external and migrate to an external cloud provider", "cloud provider %q was specified, but built-in cloud providers are disabled. Please set --cloud-provider=external and migrate to an external cloud provider",

2
pkg/kubeapiserver/options/cloudprovider.go
View File

@ -51,7 +51,7 @@ func (opts *CloudProviderOptions) Validate() []error {
errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+ errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
"please set DisableKubeletCloudCredentialProviders feature to true", opts.CloudProvider)) "please set DisableKubeletCloudCredentialProviders feature to true", opts.CloudProvider))
} }
case cloudprovider.IsDeprecatedInternal(opts.CloudProvider): case !cloudprovider.IsExternal(opts.CloudProvider):
if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) { if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) {
errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+ errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
"please set DisableCloudProviders feature to false", opts.CloudProvider)) "please set DisableCloudProviders feature to false", opts.CloudProvider))

2
pkg/kubelet/kubelet.go
View File

@ -386,7 +386,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
return nil, fmt.Errorf("invalid sync frequency %d", kubeCfg.SyncFrequency.Duration) return nil, fmt.Errorf("invalid sync frequency %d", kubeCfg.SyncFrequency.Duration)
} }
if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) && cloudprovider.IsDeprecatedInternal(cloudProvider) { if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) && !cloudprovider.IsExternal(cloudProvider) {
cloudprovider.DisableWarningForProvider(cloudProvider) cloudprovider.DisableWarningForProvider(cloudProvider)
return nil, fmt.Errorf("cloud provider %q was specified, but built-in cloud providers are disabled. Please set --cloud-provider=external and migrate to an external cloud provider", cloudProvider) return nil, fmt.Errorf("cloud provider %q was specified, but built-in cloud providers are disabled. Please set --cloud-provider=external and migrate to an external cloud provider", cloudProvider)
} }

12
staging/src/k8s.io/cloud-provider/plugins.go
View File

@ -85,18 +85,6 @@ func IsExternal(name string) bool {
return name == externalCloudProvider return name == externalCloudProvider
} }
// IsDeprecatedInternal is responsible for preventing cloud.Interface
// from being initialized in kubelet, kube-controller-manager or kube-api-server
func IsDeprecatedInternal(name string) bool {
for _, provider := range deprecatedCloudProviders {
if provider.name == name {
return true
}
}
return false
}
// DisableWarningForProvider logs information about disabled cloud provider state // DisableWarningForProvider logs information about disabled cloud provider state
func DisableWarningForProvider(providerName string) { func DisableWarningForProvider(providerName string) {
for _, provider := range deprecatedCloudProviders { for _, provider := range deprecatedCloudProviders {