github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121301 from sttts/sttts-validate-cloud-provider-2

Browse Source 
kubeapiserver/options: fix cloud provider validation
This commit is contained in:
Kubernetes Prow Robot 2023-10-26 01:08:14 +02:00 committed by GitHub
commit b7e5cbf1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,9 @@ func (opts *CloudProviderOptions) Validate() []error {
"please set DisableCloudProviders feature to true", opts.CloudProvider)) "please set DisableCloudProviders feature to true", opts.CloudProvider))
} }
if !utilfeature.DefaultFeatureGate.Enabled(features.DisableKubeletCloudCredentialProviders) { if !utilfeature.DefaultFeatureGate.Enabled(features.DisableKubeletCloudCredentialProviders) {
errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+ //nolint:staticcheck,ineffassign // false positive 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))
} }
return nil
case cloudprovider.IsDeprecatedInternal(opts.CloudProvider): case cloudprovider.IsDeprecatedInternal(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', "+