Kubelet server handler cleanup

This commit is contained in:
Tim Allclair 2025-01-21 16:31:52 -08:00
parent 93e460114d
commit 4272f7016c

View File

@ -442,17 +442,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
@ -547,6 +536,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