Merge pull request #123732 from serathius/parallel-featureflags

Fix SetFeatureGateDuringTest handling of Parallel tests

Kubernetes-commit: e062f925aec9137ca3f06704c6adb2883812e657

go.mod

@@ -24,12 +24,12 @@ require (
 	google.golang.org/grpc v1.58.3
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20240306165540-05aa4bceed70
-	k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5
-	k8s.io/apiserver v0.0.0-20240306172940-17663913a4fd
-	k8s.io/client-go v0.0.0-20240306170515-0cdc0ce850af
-	k8s.io/code-generator v0.0.0-20240306171749-c9df80eb5e54
-	k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae
+	k8s.io/api v0.0.0-20240311194616-96558b97565e
+	k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
+	k8s.io/apiserver v0.0.0-20240312001401-07ca000ce972
+	k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a
+	k8s.io/code-generator v0.0.0-20240327163807-71421176fc0e
+	k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d
 	k8s.io/klog/v2 v2.120.1
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -122,16 +122,8 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
-	k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7 // indirect
+	k8s.io/kms v0.0.0-20240327165525-6bf80055228c // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
 )
 
-replace (
-	k8s.io/api => k8s.io/api v0.0.0-20240306165540-05aa4bceed70
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240306172940-17663913a4fd
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20240306170515-0cdc0ce850af
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20240306171749-c9df80eb5e54
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae
-	k8s.io/kms => k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7
-)
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307160843-0407311be590

go.sum

@@ -376,24 +376,24 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20240306165540-05aa4bceed70 h1:Kw6GufAvqr668v56lckDWoGHFG5wwjQRjYuf+PMt1us=
-k8s.io/api v0.0.0-20240306165540-05aa4bceed70/go.mod h1:S69aw/5045kbDeBVmy89EQxSM7v5kHdLNzO4wt3OZ2o=
-k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5 h1:YRP8FbAab9hlobsEfyUG7P6dC6hbVTLw0eFY/AnewmY=
-k8s.io/apimachinery v0.0.0-20240306164812-cbfe0a1feaa5/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
-k8s.io/apiserver v0.0.0-20240306172940-17663913a4fd h1:epNppmSMUuJL2TpEKJN9mGdipws7IAsRp4wHozRLnmI=
-k8s.io/apiserver v0.0.0-20240306172940-17663913a4fd/go.mod h1:St1PmKeeAHl34HIFGJMPbD+sNLyXk4bRNv1ptaHPOg8=
-k8s.io/client-go v0.0.0-20240306170515-0cdc0ce850af h1:hU8WcNO9vZrUXLzKbyXj6FUlMuTecjBr7MmbGxfCkzM=
-k8s.io/client-go v0.0.0-20240306170515-0cdc0ce850af/go.mod h1:g+S/ljjD+b0SS7OkKeZ6IBio03Ot9Q8s19hN3jHsl/Y=
-k8s.io/code-generator v0.0.0-20240306171749-c9df80eb5e54 h1:BooyL7i5YIYtXh4lUUDJ7d8qaFy/PFf+WvRSOK3UCrE=
-k8s.io/code-generator v0.0.0-20240306171749-c9df80eb5e54/go.mod h1:gmJp+Ea+u8C4QlTlnkVtViOIsQKlpDCtC6zjiJaGCrc=
-k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae h1:/bnYoyvHvOnxGRpKc3z/RG0R/gzUwIFg2zKk8UkVchM=
-k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae/go.mod h1:xHRknJm8Q13BCZjYtVCjnJJEzKC9RMj6OqPgtPWU8yI=
+k8s.io/api v0.0.0-20240311194616-96558b97565e h1:Z2GqjWWNuM6kr7OiUdpQvs+x7vUU96a+7YdYilq3Ku8=
+k8s.io/api v0.0.0-20240311194616-96558b97565e/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0=
+k8s.io/apimachinery v0.0.0-20240307160843-0407311be590 h1:YFg0j+PVfNLayHtZ3gdTeW12q7HECwhvZm9fWZpXyXo=
+k8s.io/apimachinery v0.0.0-20240307160843-0407311be590/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
+k8s.io/apiserver v0.0.0-20240312001401-07ca000ce972 h1:bku6fX/avO/gFB24AgcvedTqPNAXSKpE9+sQtqFyrMA=
+k8s.io/apiserver v0.0.0-20240312001401-07ca000ce972/go.mod h1:+td/uc6gDoEXNokRi3MP7Bh57ER5HTMcARcwEOCHRwU=
+k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a h1:EMeP7Xj22C0bpj+nV6cxqBExDijGzRKs66AY4NDStYw=
+k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a/go.mod h1:QDFa4l0JGh2EmATyNXW9l58yiTy4DIoVjrfyNgOxfOQ=
+k8s.io/code-generator v0.0.0-20240327163807-71421176fc0e h1:zlsfzK9qpxCp2ahp494MTOUM0uxV8X5YaG4hfbtbcXI=
+k8s.io/code-generator v0.0.0-20240327163807-71421176fc0e/go.mod h1:0VAoUbzMRwLcq5yON5v0Dv5ZX4OlSKp1Lj02Opwv4iA=
+k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d h1:ElzOwFH19gmQPM7aqZ7+fYZp0EID1DEybYBEDdd6RrM=
+k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d/go.mod h1:A/J8LmrMt2JRruTIpFoVJBF/zxF9tKg/rTcFjeI2F8M=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7 h1:v9feiZ9mQnGuvoKR8FkDM/2yuptz78hIiFIGJrhY5oA=
-k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7/go.mod h1:Z8nrOW3UFa7WlN70KZvdbXOibJlhHr8pXAoqfjO/Owk=
+k8s.io/kms v0.0.0-20240327165525-6bf80055228c h1:3xRskaoHe8gjLIIeH+2V800bl6ZluP67+88BlneBF0w=
+k8s.io/kms v0.0.0-20240327165525-6bf80055228c/go.mod h1:Z8nrOW3UFa7WlN70KZvdbXOibJlhHr8pXAoqfjO/Owk=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=

test/integration/fieldselector_test.go

@@ -699,13 +699,13 @@ func TestFieldSelectorDisablement(t *testing.T) {
 
 	crd := selectableFieldFixture.DeepCopy()
 	// Write a field that uses the feature while the feature gate is enabled
-	func() {
+	t.Run("CustomResourceFieldSelectors", func(t *testing.T) {
 		defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, apiextensionsfeatures.CustomResourceFieldSelectors, true)()
 		crd, err = fixtures.CreateNewV1CustomResourceDefinition(crd, apiExtensionClient, dynamicClient)
 		if err != nil {
 			t.Fatal(err)
 		}
-	}()
+	})
 
 	// Now that the feature gate is disabled again, update the CRD to trigger an openAPI update
 	crd, err = apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crd.Name, metav1.GetOptions{})