Merge pull request #120141 from Jefftree/automated-cherry-pick-of-#12…

…0109-upstream-release-1.28

Automated cherry pick of #120109: Add wait for cache sync

Kubernetes-commit: 01b42ed8c345343361a3ea7bb25a079a00845407

go.mod

@@ -27,7 +27,7 @@ require (
 	k8s.io/api v0.0.0-20230904104028-546e4253e738
 	k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
 	k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e
-	k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
+	k8s.io/client-go v0.0.0-20230904110526-745513ad7b37
 	k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
 	k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
 	k8s.io/klog/v2 v2.100.1
@@ -130,7 +130,7 @@ replace (
 	k8s.io/api => k8s.io/api v0.0.0-20230904104028-546e4253e738
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
 	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20230904110526-745513ad7b37
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
 	k8s.io/kms => k8s.io/kms v0.0.0-20230904112654-85054a342003

go.sum

@@ -675,8 +675,8 @@ k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406 h1:/YP5PLKVrV5WDzScq2agCB
 k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
 k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e h1:J1HaAqOL9irju2bXc34G3Z2UTXZVnE+GLOfSD1NTwRg=
 k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e/go.mod h1:CjTNnDKEDMQHdsr2dzFdIFuoZxfXISlPuT7BSOa3YQw=
-k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a h1:Qgr4OBvwwsxyKonHVJCGGOJH4Zee2uMD1v2st+fVByY=
-k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a/go.mod h1:9oac6LWqvfKcphw6P69YH6Ns8xgf4S3ciKrBfqXxq3c=
+k8s.io/client-go v0.0.0-20230904110526-745513ad7b37 h1:+SF0CtBoQI6Eso+8poN4i55d4oUahClerZwALYSz6Tw=
+k8s.io/client-go v0.0.0-20230904110526-745513ad7b37/go.mod h1:9oac6LWqvfKcphw6P69YH6Ns8xgf4S3ciKrBfqXxq3c=
 k8s.io/code-generator v0.0.0-20230807201159-791c213a776b h1:SQbgU/KO+8dA4z1FG2Miatu7XYb3oDc7tzbycneiyDY=
 k8s.io/code-generator v0.0.0-20230807201159-791c213a776b/go.mod h1:ueeSJZJ61NHBa0ccWLey6mwawum25vX61nRZ6WOzN9A=
 k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3 h1:6J1OGuJeD5K+0YHFN5lOfVIIEpg+Iw+0w4VEw+EipVE=

pkg/controller/openapi/controller_test.go

@@ -332,6 +332,7 @@ func setup(t *testing.T) (*testEnv, context.Context) {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	factory.Start(ctx.Done())
+	factory.WaitForCacheSync(ctx.Done())
 
 	env.mux = http.NewServeMux()
 	h := handler.NewOpenAPIService(&spec.Swagger{})