Merge pull request #123994 from serathius/undo-double-run-test-watch-…

…semantics

Undo double run of the TestWatchSemantics test to avoid hitting timeout

Kubernetes-commit: fe9e4698a33565e9d334439f3a6e494366d8ee8d

go.mod

@@ -43,12 +43,12 @@ require (
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/square/go-jose.v2 v2.6.0
-	k8s.io/api v0.0.0-20240314205423-d1659ebfc7f3
+	k8s.io/api v0.0.0-20240327161255-35ca1f4086ff
 	k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
-	k8s.io/client-go v0.0.0-20240314205749-eea636f8f427
-	k8s.io/component-base v0.0.0-20240312000449-3c774a67a455
+	k8s.io/client-go v0.0.0-20240327162728-b4632b75ff72
+	k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d
 	k8s.io/klog/v2 v2.120.1
-	k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7
+	k8s.io/kms v0.0.0-20240327165525-6bf80055228c
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0
@@ -123,3 +123,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307160843-0407311be590

go.sum

@@ -381,18 +381,18 @@ 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-20240314205423-d1659ebfc7f3 h1:qOTA6AgJrLhETfhNJHy4J7tSgOXdIC7hts3Sr5Gesbk=
-k8s.io/api v0.0.0-20240314205423-d1659ebfc7f3/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0=
-k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a h1:0OAuWcxW23YggVeW/f7sDWuEF2U4HDVSN+CQNMxwimI=
-k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
-k8s.io/client-go v0.0.0-20240314205749-eea636f8f427 h1:s18pdZWxA/0ldOzFbTXsB33L+qYLEievhyPlrK3OH5w=
-k8s.io/client-go v0.0.0-20240314205749-eea636f8f427/go.mod h1:DDioyuLBMAT1GM69W+aR9Mmq99LTjibb8bSq29d+CDY=
-k8s.io/component-base v0.0.0-20240312000449-3c774a67a455 h1:j5fjafwm40Ic4FCzHeQYFRtm6BkRZermvXfr3CpPvD0=
-k8s.io/component-base v0.0.0-20240312000449-3c774a67a455/go.mod h1:MAhTa66phLV2a0us+GQWKR6GcD9PZlzuPnoGoWrCj+A=
+k8s.io/api v0.0.0-20240327161255-35ca1f4086ff h1:e8yw7ZOfgZIwvHVsyOhDxw48BKRwp6sr/YcSFcfY9eQ=
+k8s.io/api v0.0.0-20240327161255-35ca1f4086ff/go.mod h1:jx/i0gF0i9rnbXh49C9IzLaqYOpW+JmxsmUJRq8YNIw=
+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/client-go v0.0.0-20240327162728-b4632b75ff72 h1:y9IcxUEL6hCk7C9ZF4dbnXEOyevBqCC44/Vk7+ULtGg=
+k8s.io/client-go v0.0.0-20240327162728-b4632b75ff72/go.mod h1:fYOmyOV2J9kzMfM6niYhBrIRZe0v3uEnUK0iPpOBOHs=
+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/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=

pkg/storage/cacher/cacher_test.go

@@ -381,18 +381,9 @@ func TestSendInitialEventsBackwardCompatibility(t *testing.T) {
 }
 
 func TestWatchSemantics(t *testing.T) {
-	t.Run("WatchFromStorageWithoutResourceVersion=true", func(t *testing.T) {
-		defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchFromStorageWithoutResourceVersion, true)()
-		store, terminate := testSetupWithEtcdAndCreateWrapper(t)
-		t.Cleanup(terminate)
-		storagetesting.RunWatchSemantics(context.TODO(), t, store)
-	})
-	t.Run("WatchFromStorageWithoutResourceVersion=false", func(t *testing.T) {
-		defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchFromStorageWithoutResourceVersion, false)()
-		store, terminate := testSetupWithEtcdAndCreateWrapper(t)
-		t.Cleanup(terminate)
-		storagetesting.RunWatchSemantics(context.TODO(), t, store)
-	})
+	store, terminate := testSetupWithEtcdAndCreateWrapper(t)
+	t.Cleanup(terminate)
+	storagetesting.RunWatchSemantics(context.TODO(), t, store)
 }
 
 func TestWatchSemanticInitialEventsExtended(t *testing.T) {