serve pprof in metrics server if metrics server listens on 0.0.0.0 (#…

…4384)

Signed-off-by: zhangzujian <[email protected]>

cmd/controller/controller.go

@@ -53,7 +53,9 @@ func CmdMain() {
 	ctrl.SetLogger(klog.NewKlogr())
 	ctx := signals.SetupSignalHandler()
 	go func() {
-		if config.EnablePprof {
+		metricsAddr := util.GetDefaultListenAddr()
+		servePprofInMetricsServer := config.EnableMetrics && metricsAddr == "0.0.0.0"
+		if config.EnablePprof && !servePprofInMetricsServer {
 			mux := http.NewServeMux()
 			mux.HandleFunc("/debug/pprof/", pprof.Index)
 			mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
@@ -87,8 +89,8 @@ func CmdMain() {
 		}
 		metrics.InitKlogMetrics()
 		metrics.InitClientGoMetrics()
-		addr := util.JoinHostPort(util.GetDefaultListenAddr(), config.PprofPort)
-		if err := metrics.Run(ctx, config.KubeRestConfig, addr, config.SecureServing); err != nil {
+		addr := util.JoinHostPort(metricsAddr, config.PprofPort)
+		if err := metrics.Run(ctx, config.KubeRestConfig, addr, config.SecureServing, servePprofInMetricsServer); err != nil {
 			util.LogFatalAndExit(err, "failed to run metrics server")
 		}
 		<-ctx.Done()

cmd/daemon/cniserver.go

@@ -113,7 +113,8 @@ func main() {
 		}()
 	}
 
-	if config.EnablePprof {
+	servePprofInMetricsServer := config.EnableMetrics && addr == "0.0.0.0"
+	if config.EnablePprof && !servePprofInMetricsServer {
 		mux := http.NewServeMux()
 		mux.HandleFunc("/debug/pprof/", pprof.Index)
 		mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
@@ -143,7 +144,7 @@ func main() {
 	}
 
 	listenAddr := util.JoinHostPort(addr, config.PprofPort)
-	if err = metrics.Run(ctx, nil, listenAddr, config.SecureServing); err != nil {
+	if err = metrics.Run(ctx, nil, listenAddr, config.SecureServing, servePprofInMetricsServer); err != nil {
 		util.LogFatalAndExit(err, "failed to run metrics server")
 	}
 	<-stopCh

cmd/ovn_monitor/ovn_monitor.go

@@ -46,7 +46,7 @@ func CmdMain() {
 
 	ctrl.SetLogger(klog.NewKlogr())
 	ctx := signals.SetupSignalHandler()
-	if err = metrics.Run(ctx, nil, addr, config.SecureServing); err != nil {
+	if err = metrics.Run(ctx, nil, addr, config.SecureServing, false); err != nil {
 		util.LogFatalAndExit(err, "failed to run metrics server")
 	}
 	<-ctx.Done()

cmd/pinger/pinger.go

@@ -34,7 +34,7 @@ func main() {
 			go func() {
 				pinger.InitPingerMetrics()
 				metrics.InitKlogMetrics()
-				if err := metrics.Run(ctx, nil, util.JoinHostPort("0.0.0.0", config.Port), false); err != nil {
+				if err := metrics.Run(ctx, nil, util.JoinHostPort("0.0.0.0", config.Port), false, false); err != nil {
 					util.LogFatalAndExit(err, "failed to run metrics server")
 				}
 				<-ctx.Done()

pkg/metrics/server.go

@@ -3,6 +3,8 @@ package metrics
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"net/http/pprof"
 
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
@@ -11,7 +13,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
-func Run(ctx context.Context, config *rest.Config, addr string, secureServing bool) error {
+func Run(ctx context.Context, config *rest.Config, addr string, secureServing, withPprof bool) error {
 	if config == nil {
 		config = ctrl.GetConfigOrDie()
 	}
@@ -28,6 +30,15 @@ func Run(ctx context.Context, config *rest.Config, addr string, secureServing bo
 	if secureServing {
 		options.FilterProvider = filters.WithAuthenticationAndAuthorization
 	}
+	if withPprof {
+		options.ExtraHandlers = map[string]http.Handler{
+			"/debug/pprof/":        http.HandlerFunc(pprof.Index),
+			"/debug/pprof/cmdline": http.HandlerFunc(pprof.Cmdline),
+			"/debug/pprof/profile": http.HandlerFunc(pprof.Profile),
+			"/debug/pprof/symbol":  http.HandlerFunc(pprof.Symbol),
+			"/debug/pprof/trace":   http.HandlerFunc(pprof.Trace),
+		}
+	}
 	svr, err := server.NewServer(options, config, client)
 	if err != nil {
 		klog.Error(err)