add paths section to kubelet statusz endpoint

Peac36 · Peac36 · commit 7c9ddcb894fd · 2025-07-27T14:12:43.000+03:00
Signed-off-by: Nikola &lt;peac36@abv.bg&gt;
diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go
@@ -317,6 +317,9 @@ func NewServer(
 	} else {
 		server.InstallDebuggingDisabledHandlers()
 	}
+
+	server.InstallStatusZ()
+
 	return server
 }
 
@@ -379,6 +382,13 @@ func (s *Server) InstallTracingFilter(tp oteltrace.TracerProvider, opts ...otelr
 	s.restfulCont.Filter(otelrestful.OTelFilter("kubelet", append(opts, otelrestful.WithTracerProvider(tp))...))
 }
 
+func (s *Server) InstallStatusZ() {
+	if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentStatusz) {
+		s.addMetricsBucketMatcher("statusz")
+		statusz.Install(s.restfulCont, ComponentKubelet, statusz.NewRegistry(compatibility.DefaultBuildEffectiveVersion(), statusz.WithListedPaths(s.restfulCont.RegisteredHandlePaths())))
+	}
+}
+
 // addMetricsBucketMatcher adds a regexp matcher and the relevant bucket to use when
 // it matches. Please be aware this is not thread safe and should not be used dynamically
 func (s *Server) addMetricsBucketMatcher(bucket string) {
@@ -574,11 +584,6 @@ func (s *Server) InstallAuthRequiredHandlers() {
 	s.addMetricsBucketMatcher("configz")
 	configz.InstallHandler(s.restfulCont)
 
-	if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentStatusz) {
-		s.addMetricsBucketMatcher("statusz")
-		statusz.Install(s.restfulCont, ComponentKubelet, statusz.NewRegistry(compatibility.DefaultBuildEffectiveVersion()))
-	}
-
 	if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentFlagz) {
 		if s.flagz != nil {
 			s.addMetricsBucketMatcher("flagz")
diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go
@@ -514,6 +514,36 @@ func assertHealthFails(t *testing.T, httpURL string, expectedErrorCode int) {
 	}
 }
 
+func TestStatusz(t *testing.T) {
+	featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, zpagesfeatures.ComponentStatusz, true)
+
+	fw := newServerTest()
+	defer fw.testHTTPServer.Close()
+
+	req, err := http.NewRequest("GET", fw.testHTTPServer.URL+"/statusz", nil)
+	if err != nil {
+		t.Fatalf("Got error creating request: %v", err)
+	}
+	req.Header.Set("Accept", "text/plain")
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatalf("Got error GETing: %v", err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Errorf("expected status code %d, got %d", http.StatusOK, resp.StatusCode)
+	}
+	resBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got error reading response body: %v", err)
+	}
+
+	resBodyString := string(resBody)
+	if !strings.Contains(resBodyString, "Paths") || !strings.Contains(resBodyString, "/configz /debug /healthz /metrics") {
+		t.Errorf("statusz paths missing: %s\n\nExpected: %q", resBodyString, "Paths<delimter> /configz /debug /healthz /metrics")
+	}
+}
+
 // Ensure all registered handlers & services have an associated testcase.
 func TestAuthzCoverage(t *testing.T) {
 	fw := newServerTest()
