Skip to content

Commit 6093bba

Browse files
k8s-publishing-botk8s-publishing-bot
committed
Merge pull request #134366 from tallclair/feature-gates-test
Set multiple feature gates simultaneously in test Kubernetes-commit: db63a581ca301281a28fca757dcd37fd4c8cf8bf
2 parents c651ec0 + 6731d08 commit 6093bba

File tree

5 files changed

+29
-19
lines changed

5 files changed

+29
-19
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ require (
4848
gopkg.in/evanphx/json-patch.v4 v4.13.0
4949
gopkg.in/go-jose/go-jose.v2 v2.6.3
5050
gopkg.in/natefinch/lumberjack.v2 v2.2.1
51-
k8s.io/api v0.0.0-20251008212439-8ac373c4a0f3
51+
k8s.io/api v0.0.0-20251010205700-ea7b3fb357a0
5252
k8s.io/apimachinery v0.0.0-20251008212151-ff7ddf5d4ebc
53-
k8s.io/client-go v0.0.0-20251008212835-efcdcf78282a
54-
k8s.io/component-base v0.0.0-20251008214106-9ac7e8877ae9
53+
k8s.io/client-go v0.0.0-20251009132834-8de342516c3d
54+
k8s.io/component-base v0.0.0-20251013235701-797fe69345a1
5555
k8s.io/klog/v2 v2.130.1
5656
k8s.io/kms v0.0.0-20250918004306-2fba1b2102ee
5757
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,14 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
295295
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
296296
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
297297
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
298-
k8s.io/api v0.0.0-20251008212439-8ac373c4a0f3 h1:YgVQ+Qgh7rVCCPTCDJ+MYvwnQWyLbgqS2K/cBaQzZSQ=
299-
k8s.io/api v0.0.0-20251008212439-8ac373c4a0f3/go.mod h1:2QWI4G7Z29PJMgZodjE0JE4CUpVhg3xyP/aAiHciRh8=
298+
k8s.io/api v0.0.0-20251010205700-ea7b3fb357a0 h1:mowQTrouYk9kgzE8McZGwb6HldJnWbuIXetfVpM4YXw=
299+
k8s.io/api v0.0.0-20251010205700-ea7b3fb357a0/go.mod h1:2QWI4G7Z29PJMgZodjE0JE4CUpVhg3xyP/aAiHciRh8=
300300
k8s.io/apimachinery v0.0.0-20251008212151-ff7ddf5d4ebc h1:QUNPCNgaM5vq8hPZ3ia8pbKf8pLBz+3s2Oevtgwlp5o=
301301
k8s.io/apimachinery v0.0.0-20251008212151-ff7ddf5d4ebc/go.mod h1:wE5nOmI8k5gdg4Nuo6Csst6CE+WgeB7ZNhh7K5lLUbs=
302-
k8s.io/client-go v0.0.0-20251008212835-efcdcf78282a h1:MHjyLaZpZ8W9W7J06C7YmSHKN1A35nkfVQQ97bY4m0w=
303-
k8s.io/client-go v0.0.0-20251008212835-efcdcf78282a/go.mod h1:0O1zxZNXbyeoMJlGLzApX/6yUOS7QSRtyWcwDAKBkDM=
304-
k8s.io/component-base v0.0.0-20251008214106-9ac7e8877ae9 h1:VmsXWFkdSE9bMZtYuIU/0qznnHlcor93mXMTW0Da5oc=
305-
k8s.io/component-base v0.0.0-20251008214106-9ac7e8877ae9/go.mod h1:zr2IcvP4EOK2auMzpn4HSi/VRX4QVtCXPdsijvE4MmU=
302+
k8s.io/client-go v0.0.0-20251009132834-8de342516c3d h1:x7jXWr86q+EnQ3v0YbeYruzdlp2H+ikk7YWHntmCRo0=
303+
k8s.io/client-go v0.0.0-20251009132834-8de342516c3d/go.mod h1:pLkZ7LrYUnwinCWMPsi3ZrzXKrE12rO0DcpZoagNOlE=
304+
k8s.io/component-base v0.0.0-20251013235701-797fe69345a1 h1:pSpfXc3EjbFNP4YkG9YZVLFQlcdmtZxxzGsVOgioRwc=
305+
k8s.io/component-base v0.0.0-20251013235701-797fe69345a1/go.mod h1:YhBmNzDBbTUmP/jhWfk0Hm2uLYW/07Q6qSyN45Prf8w=
306306
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
307307
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
308308
k8s.io/kms v0.0.0-20250918004306-2fba1b2102ee h1:dCR1mK59u+fkeNCgDWwcOBbPZ4lrO4qVyDM8xIOkGOI=

‎pkg/apis/apiserver/validation/validation_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,10 @@ func TestValidateAuthenticationConfiguration(t *testing.T) {
828828
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StructuredAuthenticationConfigurationEgressSelector, *tt.structuredAuthnEgressSelectorFeatureOverride)
829829
}
830830
if tt.gaOnly {
831-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, "AllAlpha", false)
832-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, "AllBeta", false)
831+
featuregatetesting.SetFeatureGatesDuringTest(t, utilfeature.DefaultFeatureGate, featuregatetesting.FeatureOverrides{
832+
"AllAlpha": false,
833+
"AllBeta": false,
834+
})
833835
}
834836
got := ValidateAuthenticationConfiguration(authenticationcel.NewDefaultCompiler(), tt.in, tt.disallowedIssuers).ToAggregate()
835837
if d := cmp.Diff(tt.want, errString(got)); d != "" {

‎pkg/reconcilers/peer_endpoint_lease_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ func (f *peerEndpointLeaseReconciler) SetKeys(servers []serverInfo) error {
7979

8080
func TestPeerEndpointLeaseReconciler(t *testing.T) {
8181
// enable feature flags
82-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIServerIdentity, true)
83-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionAPI, true)
82+
featuregatetesting.SetFeatureGatesDuringTest(t, utilfeature.DefaultFeatureGate, featuregatetesting.FeatureOverrides{
83+
features.APIServerIdentity: true,
84+
features.StorageVersionAPI: true,
85+
})
8486

8587
server, sc := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
8688
t.Cleanup(func() { server.Terminate(t) })
@@ -189,8 +191,10 @@ func TestPeerEndpointLeaseReconciler(t *testing.T) {
189191

190192
func TestPeerLeaseRemoveEndpoints(t *testing.T) {
191193
// enable feature flags
192-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIServerIdentity, true)
193-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionAPI, true)
194+
featuregatetesting.SetFeatureGatesDuringTest(t, utilfeature.DefaultFeatureGate, featuregatetesting.FeatureOverrides{
195+
features.APIServerIdentity: true,
196+
features.StorageVersionAPI: true,
197+
})
194198

195199
server, sc := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
196200
t.Cleanup(func() { server.Terminate(t) })

‎pkg/storage/cacher/cacher_whitebox_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,10 @@ func TestGetListNonRecursiveCacheBypass(t *testing.T) {
780780

781781
func TestGetListNonRecursiveCacheWithConsistentListFromCache(t *testing.T) {
782782
// Set feature gates once at the beginning since we only care about ConsistentListFromCache=true and ListFromCacheSnapshot=false
783-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, true)
784-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ListFromCacheSnapshot, false)
783+
featuregatetesting.SetFeatureGatesDuringTest(t, utilfeature.DefaultFeatureGate, featuregatetesting.FeatureOverrides{
784+
features.ConsistentListFromCache: true,
785+
features.ListFromCacheSnapshot: false,
786+
})
785787
forceRequestWatchProgressSupport(t)
786788

787789
tests := []struct {
@@ -2411,8 +2413,10 @@ func TestCacheIntervalInvalidationStopsWatch(t *testing.T) {
24112413
}
24122414

24132415
func TestWaitUntilWatchCacheFreshAndForceAllEvents(t *testing.T) {
2414-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchList, true)
2415-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, true)
2416+
featuregatetesting.SetFeatureGatesDuringTest(t, utilfeature.DefaultFeatureGate, featuregatetesting.FeatureOverrides{
2417+
features.WatchList: true,
2418+
features.ConsistentListFromCache: true,
2419+
})
24162420
forceRequestWatchProgressSupport(t)
24172421

24182422
scenarios := []struct {

0 commit comments

Comments
 (0)