Merge pull request #2917 from k8s-infra-cherrypick-robot/cherry-pick-2874-to-release-0.18

k8s-ci-robot · web-flow · commit 9fe6db59a8e2 · 2024-08-12T05:27:16.000-07:00
[release-0.18] 🐛 AddMetricsServerExtraHandler: Info takes key/value pairs
diff --git a/pkg/manager/internal.go b/pkg/manager/internal.go
@@ -187,7 +187,7 @@ func (cm *controllerManager) AddMetricsServerExtraHandler(path string, handler h
 		return fmt.Errorf("unable to add new metrics handler because metrics endpoint has already been created")
 	}
 	if cm.metricsServer == nil {
-		cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler %q will be ignored", path)
+		cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler will be ignored", "path", path)
 		return nil
 	}
 	if err := cm.metricsServer.AddExtraHandler(path, handler); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func (cm *controllerManager) AddMetricsServerExtraHandler(path string, handler h`
`187`	`187`	`return fmt.Errorf("unable to add new metrics handler because metrics endpoint has already been created")`
`188`	`188`	`}`
`189`	`189`	`if cm.metricsServer == nil {`
`190`		`- cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler %q will be ignored", path)`
	`190`	`+ cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler will be ignored", "path", path)`
`191`	`191`	`return nil`
`192`	`192`	`}`
`193`	`193`	`if err := cm.metricsServer.AddExtraHandler(path, handler); err != nil {`