feat: list available endpoints in /statusz for kubelet

ylink-lfs · ylink-lfs · commit 38ae245d4af8 · 2025-08-05T23:40:05.000+08:00
diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go
@@ -160,6 +160,7 @@ func (a *filteringContainer) Handle(path string, handler http.Handler) {
 	a.HandleWithFilter(path, handler)
 	a.registeredHandlePaths = append(a.registeredHandlePaths, path)
 }
+
 func (a *filteringContainer) RegisteredHandlePaths() []string {
 	return a.registeredHandlePaths
 }
@@ -576,7 +577,7 @@ func (s *Server) InstallAuthRequiredHandlers() {
 
 	if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentStatusz) {
 		s.addMetricsBucketMatcher("statusz")
-		statusz.Install(s.restfulCont, ComponentKubelet, statusz.NewRegistry(compatibility.DefaultBuildEffectiveVersion()))
+		statusz.Install(s.restfulCont, ComponentKubelet, statusz.NewRegistry(compatibility.DefaultBuildEffectiveVersion(), statusz.WithListedPaths(s.restfulCont.RegisteredHandlePaths())))
 	}
 
 	if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentFlagz) {
diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go
@@ -28,6 +28,7 @@ import (
 	"net/http/httputil"
 	"net/url"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"testing"
@@ -1832,6 +1833,33 @@ func TestTrimURLPath(t *testing.T) {
 	}
 }
 
+func TestComponentStatusz(t *testing.T) {
+	featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, zpagesfeatures.ComponentStatusz, true)
+	fw := newServerTest()
+	defer fw.testHTTPServer.Close()
+
+	req, err := http.NewRequest(http.MethodGet, fw.testHTTPServer.URL+"/statusz", nil)
+	require.NoError(t, err)
+	req.Header.Set("Accept", "text/plain")
+	resp, err := http.DefaultClient.Do(req)
+	assert.NoError(t, err)
+	defer resp.Body.Close()
+
+	respByte, err := io.ReadAll(resp.Body)
+	assert.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	respStr := string(respByte)
+	statuszPathOutput := regexp.MustCompile("Paths.*\n").FindString(respStr)
+	assert.NotEqual(t, "", statuszPathOutput, "/statusz response should contain 'Paths' line")
+	listedPaths := regexp.MustCompile("/\\S+").FindAllString(statuszPathOutput, -1)
+	assert.NotEmpty(t, listedPaths, "/statusz response should contain listed paths when ComponentStatusz feature gate enabled")
+	for _, path := range listedPaths {
+		resp, err := http.Get(fw.testHTTPServer.URL + path)
+		assert.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode, "/statusz provided listed paths should return 200 status code")
+	}
+}
+
 func TestFineGrainedAuthz(t *testing.T) {
 	// Enable features.ContainerCheckpoint during test
 	featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.KubeletFineGrainedAuthz, true)

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ func (a *filteringContainer) Handle(path string, handler http.Handler) {`
`160`	`160`	`a.HandleWithFilter(path, handler)`
`161`	`161`	`a.registeredHandlePaths = append(a.registeredHandlePaths, path)`
`162`	`162`	`}`
	`163`	`+`
`163`	`164`	`func (a *filteringContainer) RegisteredHandlePaths() []string {`
`164`	`165`	`return a.registeredHandlePaths`
`165`	`166`	`}`
`@@ -576,7 +577,7 @@ func (s *Server) InstallAuthRequiredHandlers() {`
`576`	`577`
`577`	`578`	`if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentStatusz) {`
`578`	`579`	`s.addMetricsBucketMatcher("statusz")`
`579`		`- statusz.Install(s.restfulCont, ComponentKubelet, statusz.NewRegistry(compatibility.DefaultBuildEffectiveVersion()))`
	`580`	`+ statusz.Install(s.restfulCont, ComponentKubelet, statusz.NewRegistry(compatibility.DefaultBuildEffectiveVersion(), statusz.WithListedPaths(s.restfulCont.RegisteredHandlePaths())))`
`580`	`581`	`}`
`581`	`582`
`582`	`583`	`if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentFlagz) {`