UPSTREAM: <drop>: ignore validation for '--cloud-provider' flag

Signed-off-by: Sai Ramesh Vanka <svanka@redhat.com>

pkg/kubeapiserver/options/cloudprovider.go

@@ -20,9 +20,6 @@ import (
 	"fmt"
 
 	"github.com/spf13/pflag"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	cloudprovider "k8s.io/cloud-provider"
-	"k8s.io/kubernetes/pkg/features"
 )
 
 // CloudProviderOptions contains cloud provider config
@@ -43,23 +40,25 @@ func (opts *CloudProviderOptions) Validate() []error {
 	switch {
 	case opts.CloudProvider == "":
 	case opts.CloudProvider == "external":
-		if !utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) {
-			errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
-				"please set DisableCloudProviders feature to true", opts.CloudProvider))
-		}
-		if !utilfeature.DefaultFeatureGate.Enabled(features.DisableKubeletCloudCredentialProviders) {
-			errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
-				"please set DisableKubeletCloudCredentialProviders feature to true", opts.CloudProvider))
-		}
-	case cloudprovider.IsDeprecatedInternal(opts.CloudProvider):
-		if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) {
-			errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
-				"please set DisableCloudProviders feature to false", opts.CloudProvider))
-		}
-		if utilfeature.DefaultFeatureGate.Enabled(features.DisableKubeletCloudCredentialProviders) {
-			errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
-				"please set DisableKubeletCloudCredentialProviders feature to false", opts.CloudProvider))
-		}
+		/*
+				if !utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) {
+					errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
+						"please set DisableCloudProviders feature to true", opts.CloudProvider))
+				}
+				if !utilfeature.DefaultFeatureGate.Enabled(features.DisableKubeletCloudCredentialProviders) {
+					errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
+						"please set DisableKubeletCloudCredentialProviders feature to true", opts.CloudProvider))
+				}
+			case cloudprovider.IsDeprecatedInternal(opts.CloudProvider):
+				if utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) {
+					errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
+						"please set DisableCloudProviders feature to false", opts.CloudProvider))
+				}
+				if utilfeature.DefaultFeatureGate.Enabled(features.DisableKubeletCloudCredentialProviders) {
+					errs = append(errs, fmt.Errorf("when using --cloud-provider set to '%s', "+
+						"please set DisableKubeletCloudCredentialProviders feature to false", opts.CloudProvider))
+				}
+		*/
 	default:
 		errs = append(errs, fmt.Errorf("unknown --cloud-provider: %s", opts.CloudProvider))
 	}