Merge pull request #497 from ggriffiths/release-4.0_cherrypick_f949f2be3b0f6446b6ffe786a7a372e21b415ccc

k8s-ci-robot · web-flow · commit bf03ef3dffa9 · 2021-04-16T19:48:22.000-07:00
Fix snapshotter metrics server to use httpEndpoint when provided
diff --git a/cmd/csi-snapshotter/main.go b/cmd/csi-snapshotter/main.go
@@ -154,7 +154,7 @@ func main() {
 		metricsManager.SetDriverName(driverName)
 		go func() {
 			klog.Infof("ServeMux listening at %q", addr)
-			err := http.ListenAndServe(*metricsAddress, mux)
+			err := http.ListenAndServe(addr, mux)
 			if err != nil {
 				klog.Fatalf("Failed to start HTTP server at specified address (%q) and metrics path (%q): %s", addr, *metricsPath, err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func main() {`
`154`	`154`	`metricsManager.SetDriverName(driverName)`
`155`	`155`	`go func() {`
`156`	`156`	`klog.Infof("ServeMux listening at %q", addr)`
`157`		`- err := http.ListenAndServe(*metricsAddress, mux)`
	`157`	`+ err := http.ListenAndServe(addr, mux)`
`158`	`158`	`if err != nil {`
`159`	`159`	`klog.Fatalf("Failed to start HTTP server at specified address (%q) and metrics path (%q): %s", addr, *metricsPath, err)`
`160`	`160`	`}`