github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130010 from tallclair/automated-cherry-pick-of-#129739-upstream-release-1.32

Browse Source 
Automated cherry pick of #129739: Kubelet server handler cleanup
This commit is contained in:
Kubernetes Prow Robot 2025-02-06 23:47:56 -08:00 committed by GitHub
commit b53c36d327
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubelet/server/server.go
View File

@ -472,17 +472,6 @@ func (s *Server) InstallDefaultHandlers() {
s.restfulCont.Handle(proberMetricsPath, s.restfulCont.Handle(proberMetricsPath,
compbasemetrics.HandlerFor(p, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}), compbasemetrics.HandlerFor(p, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
) )
// Only enable checkpoint API if the feature is enabled
if utilfeature.DefaultFeatureGate.Enabled(features.ContainerCheckpoint) {
s.addMetricsBucketMatcher("checkpoint")
ws = &restful.WebService{}
ws.Path(checkpointPath).Produces(restful.MIME_JSON)
ws.Route(ws.POST("/{podNamespace}/{podID}/{containerName}").
To(s.checkpoint).
Operation("checkpoint"))
s.restfulCont.Add(ws)
}
} }
// InstallDebuggingHandlers registers the HTTP request patterns that serve logs or run commands/containers // InstallDebuggingHandlers registers the HTTP request patterns that serve logs or run commands/containers
@ -577,6 +566,17 @@ func (s *Server) InstallDebuggingHandlers() {
To(s.getRunningPods). To(s.getRunningPods).
Operation("getRunningPods")) Operation("getRunningPods"))
s.restfulCont.Add(ws) s.restfulCont.Add(ws)
// Only enable checkpoint API if the feature is enabled
if utilfeature.DefaultFeatureGate.Enabled(features.ContainerCheckpoint) {
s.addMetricsBucketMatcher("checkpoint")
ws = &restful.WebService{}
ws.Path(checkpointPath).Produces(restful.MIME_JSON)
ws.Route(ws.POST("/{podNamespace}/{podID}/{containerName}").
To(s.checkpoint).
Operation("checkpoint"))
s.restfulCont.Add(ws)
}
} }
// InstallDebuggingDisabledHandlers registers the HTTP request patterns that provide better error message // InstallDebuggingDisabledHandlers registers the HTTP request patterns that provide better error message