diff --git a/pkg/credentialprovider/gcp/metadata_test.go b/pkg/credentialprovider/gcp/metadata_test.go index 130da5bb1c6..6de2dc7b838 100644 --- a/pkg/credentialprovider/gcp/metadata_test.go +++ b/pkg/credentialprovider/gcp/metadata_test.go @@ -30,7 +30,10 @@ import ( "testing" utilnet "k8s.io/apimachinery/pkg/util/net" + utilfeature "k8s.io/apiserver/pkg/util/feature" + featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/pkg/credentialprovider" + kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/legacy-cloud-providers/gce/gcpcredential" ) @@ -53,6 +56,9 @@ func TestMetadata(t *testing.T) { if runtime.GOOS == "windows" && !onGCEVM() { t.Skip("Skipping test on Windows, not on GCE.") } + + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, kubefeatures.DisableKubeletCloudCredentialProviders, false)() + var err error gceProductNameFile, err = createProductNameFile() if err != nil { diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 7ea31692dcc..6782d2b909a 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -229,6 +229,7 @@ const ( // owner: @andrewsykim // alpha: v1.22 + // beta: v1.28 // // Disable any functionality in kube-apiserver, kube-controller-manager and kubelet related to the `--cloud-provider` component flag. DisableCloudProviders featuregate.Feature = "DisableCloudProviders"