github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

fix failing metadata test

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2023-04-20 10:41:32 -04:00
parent cdcbfcc0a6
commit 42e8cfa28a
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/credentialprovider/gcp/metadata_test.go
View File

@ -30,7 +30,10 @@ import (
"testing" "testing"
utilnet "k8s.io/apimachinery/pkg/util/net" 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" "k8s.io/kubernetes/pkg/credentialprovider"
kubefeatures "k8s.io/kubernetes/pkg/features"
"k8s.io/legacy-cloud-providers/gce/gcpcredential" "k8s.io/legacy-cloud-providers/gce/gcpcredential"
) )
@ -53,6 +56,9 @@ func TestMetadata(t *testing.T) {
if runtime.GOOS == "windows" && !onGCEVM() { if runtime.GOOS == "windows" && !onGCEVM() {
t.Skip("Skipping test on Windows, not on GCE.") t.Skip("Skipping test on Windows, not on GCE.")
} }
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, kubefeatures.DisableKubeletCloudCredentialProviders, false)()
var err error var err error
gceProductNameFile, err = createProductNameFile() gceProductNameFile, err = createProductNameFile()
if err != nil { if err != nil {

1
pkg/features/kube_features.go
View File

@ -229,6 +229,7 @@ const (
// owner: @andrewsykim // owner: @andrewsykim
// alpha: v1.22 // alpha: v1.22
// beta: v1.28
// //
// Disable any functionality in kube-apiserver, kube-controller-manager and kubelet related to the `--cloud-provider` component flag. // Disable any functionality in kube-apiserver, kube-controller-manager and kubelet related to the `--cloud-provider` component flag.
DisableCloudProviders featuregate.Feature = "DisableCloudProviders" DisableCloudProviders featuregate.Feature = "DisableCloudProviders"