From bda81f1b68e22671e5e26953f0086ac6fca9d8aa Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Tue, 21 Jan 2025 16:31:52 -0800 Subject: [PATCH] Kubelet server handler cleanup --- pkg/kubelet/server/server.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 08a9ca5bb03..8ba83872c7f 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -479,17 +479,6 @@ func (s *Server) InstallDefaultHandlers() { s.restfulCont.Handle(proberMetricsPath, 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 @@ -589,6 +578,17 @@ func (s *Server) InstallDebuggingHandlers() { To(s.getRunningPods). Operation("getRunningPods")) 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