UPSTREAM: <carry>: do-not-merge - test what happens if we fix unexpected request event emission on <5.0

jacobsee · jacobsee · commit 779452947cd9 · 2026-06-09T10:58:27.000-07:00
diff --git a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
@@ -593,7 +593,7 @@ func (s preparedGenericAPIServer) RunWithContext(ctx context.Context) error {
 		Listener:   s.SecureServingInfo.Listener,
 		lateStopCh: lateStopCh,
 	}
-	unexpectedRequestsEventf.Store(s.Eventf)
+	unexpectedRequestsEventf.Store(eventfFunc(s.Eventf))
 
 	// close socket after delayed stopCh
 	shutdownTimeout := s.ShutdownTimeout

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ func (s preparedGenericAPIServer) RunWithContext(ctx context.Context) error {`
`593`	`593`	`Listener: s.SecureServingInfo.Listener,`
`594`	`594`	`lateStopCh: lateStopCh,`
`595`	`595`	`}`
`596`		`- unexpectedRequestsEventf.Store(s.Eventf)`
	`596`	`+ unexpectedRequestsEventf.Store(eventfFunc(s.Eventf))`
`597`	`597`
`598`	`598`	`// close socket after delayed stopCh`
`599`	`599`	`shutdownTimeout := s.ShutdownTimeout`