Skip to content

Test unexpected request event emission 2 #2697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jacobsee wants to merge 3 commits into
base: release-4.22
Choose a base branch
from
+18 −1
Draft

Test unexpected request event emission 2 #2697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4a19c4
UPSTREAM: <carry>: fix unexpected request event emission
jacobsee Jun 9, 2026
6e4b1c1
UPSTREAM: <carry>: introduce delay in the post-start hooks
jacobsee Jun 21, 2026
1d86ebc
UPSTREAM: <carry>: tmp commit to prove issue - i could be doing somet…
jacobsee Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pkg/controlplane/apiserver/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"net/http"
"strings"
"sync"
"time"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1"
Expand Down Expand Up @@ -196,6 +197,22 @@ func CreateAggregatorServer(aggregatorConfig aggregatorapiserver.CompletedConfig
return nil, err
}

// temporary hook to prove the pre-ready request window exists on 1.35.
// This hook is registered on the aggregator's GenericAPIServer so its readyz check
// blocks the aggregator's /readyz endpoint.
//
// This simulates the readiness delay that storage-readiness causes on 1.36, which
// propagates through apiservice-wait-for-first-sync to block the aggregator's HasBeenReady.
// A hook on the kube-apiserver level does NOT work because its readyz check is on
// the kube-apiserver's mux, which is shadowed by the aggregator's /readyz handler.
aggregatorServer.GenericAPIServer.AddPostStartHookOrDie("prove-pre-ready-window", func(hookContext genericapiserver.PostStartHookContext) error {
select {
case <-time.After(5 * time.Second):
case <-hookContext.Done():
}
return nil
})

err = aggregatorServer.GenericAPIServer.AddBootSequenceHealthChecks(
makeAPIServiceAvailableHealthCheck(
"autoregister-completion",
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down