Merge pull request kubernetes#89724 from zhouya0/add_missing_build_info_metric

k8s-ci-robot · web-flow · commit 9d74a1e3dbbe · 2020-04-08T20:11:44.000-07:00
Add missing kube build version info metrics
diff --git a/cmd/kube-apiserver/BUILD b/cmd/kube-apiserver/BUILD
@@ -22,6 +22,7 @@ go_library(
         "//cmd/kube-apiserver/app:go_default_library",
         "//staging/src/k8s.io/component-base/logs:go_default_library",
         "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library",
+        "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",
     ],
 )
 
diff --git a/cmd/kube-apiserver/apiserver.go b/cmd/kube-apiserver/apiserver.go
@@ -25,6 +25,7 @@ import (
 
 	"k8s.io/component-base/logs"
 	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins
+	_ "k8s.io/component-base/metrics/prometheus/version"  // for version metric registration
 	"k8s.io/kubernetes/cmd/kube-apiserver/app"
 )
 
diff --git a/cmd/kube-scheduler/BUILD b/cmd/kube-scheduler/BUILD
@@ -23,6 +23,7 @@ go_library(
         "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
         "//staging/src/k8s.io/component-base/logs:go_default_library",
         "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library",
+        "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )
diff --git a/cmd/kube-scheduler/scheduler.go b/cmd/kube-scheduler/scheduler.go
@@ -26,6 +26,7 @@ import (
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
 	_ "k8s.io/component-base/metrics/prometheus/clientgo"
+	_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
 	"k8s.io/kubernetes/cmd/kube-scheduler/app"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ go_library(`
`22`	`22`	`"//cmd/kube-apiserver/app:go_default_library",`
`23`	`23`	`"//staging/src/k8s.io/component-base/logs:go_default_library",`
`24`	`24`	`"//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library",`
	`25`	`+ "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",`
`25`	`26`	`],`
`26`	`27`	`)`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"k8s.io/component-base/logs"`
`27`	`27`	`_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins`
	`28`	`+ _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration`
`28`	`29`	`"k8s.io/kubernetes/cmd/kube-apiserver/app"`
`29`	`30`	`)`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ go_library(`
`23`	`23`	`"//staging/src/k8s.io/component-base/cli/flag:go_default_library",`
`24`	`24`	`"//staging/src/k8s.io/component-base/logs:go_default_library",`
`25`	`25`	`"//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:go_default_library",`
	`26`	`+ "//staging/src/k8s.io/component-base/metrics/prometheus/version:go_default_library",`
`26`	`27`	`"//vendor/github.com/spf13/pflag:go_default_library",`
`27`	`28`	`],`
`28`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`cliflag "k8s.io/component-base/cli/flag"`
`27`	`27`	`"k8s.io/component-base/logs"`
`28`	`28`	`_ "k8s.io/component-base/metrics/prometheus/clientgo"`
	`29`	`+ _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration`
`29`	`30`	`"k8s.io/kubernetes/cmd/kube-scheduler/app"`
`30`	`31`	`)`
`31`	`32`