Move client-go injected metrics into component-base

add workqueue and restclient to shared client metrics add leaderelection shared metrics and add a wrapper around clientgo metrics for bundled registration delete deprecated metrics from workqueue merge dep changes fix vendored deps fix path names for shared promethues client-go metrics move version directly into comp-base/metrics, simplify legacy registy codepaths
kubernetes · Aug 14, 2019 · 6e3298d · 6e3298d
1 parent 1f6cb3c
commit 6e3298d
Show file tree

Hide file tree

Showing 36 changed files with 800 additions and 349 deletions.
diff --git a/hack/lib/version.sh b/hack/lib/version.sh
@@ -161,6 +161,7 @@ kube::version::ldflags() {
       "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/client-go/pkg/version.${key}=${val}'"
       "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/kubectl/pkg/version.${key}=${val}'"
       "-X '${KUBE_GO_PACKAGE}/cmd/kubeadm/app/version.${key}=${val}'"
+      "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/component-base/metrics/version.${key}=${val}'"
     )
   }
 

diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml
@@ -56,6 +56,8 @@
   allowedImports:
   - k8s.io/apimachinery
   - k8s.io/component-base
+  - k8s.io/client-go
+  - k8s.io/client-go/tools/
   - k8s.io/klog
   - k8s.io/utils
 

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -110,6 +110,10 @@ rules:
     dependencies:
     - repository: apimachinery
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/component-base
@@ -540,6 +544,10 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kube-proxy
@@ -604,6 +612,10 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kube-scheduler
@@ -636,6 +648,10 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kube-controller-manager

diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod
@@ -13,15 +13,19 @@ require (
 	github.com/spf13/pflag v1.0.3
 	github.com/stretchr/testify v1.3.0
 	k8s.io/apimachinery v0.0.0
+	k8s.io/client-go v0.0.0
 	k8s.io/klog v0.4.0
 	k8s.io/utils v0.0.0-20190801114015-581e00157fb1
 )
 
 replace (
+	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
+	k8s.io/api => ../api
 	k8s.io/apimachinery => ../apimachinery
+	k8s.io/client-go => ../client-go
 	k8s.io/component-base => ../component-base
 )
diff --git a/staging/src/k8s.io/component-base/go.sum b/staging/src/k8s.io/component-base/go.sum
diff --git a/staging/src/k8s.io/component-base/metrics/BUILD b/staging/src/k8s.io/component-base/metrics/BUILD
@@ -5,6 +5,7 @@ load(
     "go_library",
     "go_test",
 )
+load("//staging/src/k8s.io/component-base/metrics/version:def.bzl", "version_x_defs")
 
 go_library(
     name = "go_default_library",
@@ -17,13 +18,15 @@ go_library(
         "processstarttime.go",
         "registry.go",
         "summary.go",
+        "version.go",
         "version_parser.go",
         "wrappers.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/metrics",
     importpath = "k8s.io/component-base/metrics",
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
+        "//staging/src/k8s.io/component-base/metrics/version:go_default_library",
         "//vendor/github.com/blang/semver:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/prometheus/client_model/go:go_default_library",
@@ -64,6 +67,10 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//staging/src/k8s.io/component-base/metrics/legacyregistry:all-srcs",
+        "//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:all-srcs",
+        "//staging/src/k8s.io/component-base/metrics/prometheus/restclient:all-srcs",
+        "//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:all-srcs",
+        "//staging/src/k8s.io/component-base/metrics/version:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/staging/src/k8s.io/component-base/metrics/counter_test.go b/staging/src/k8s.io/component-base/metrics/counter_test.go
@@ -74,7 +74,7 @@ func TestCounter(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			registry := NewKubeRegistry(apimachineryversion.Info{
+			registry := newKubeRegistry(apimachineryversion.Info{
 				Major:      "1",
 				Minor:      "15",
 				GitVersion: "v1.15.0-alpha-1.12345",
@@ -188,7 +188,7 @@ func TestCounterVec(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			registry := NewKubeRegistry(apimachineryversion.Info{
+			registry := newKubeRegistry(apimachineryversion.Info{
 				Major:      "1",
 				Minor:      "15",
 				GitVersion: "v1.15.0-alpha-1.12345",

diff --git a/staging/src/k8s.io/component-base/metrics/gauge_test.go b/staging/src/k8s.io/component-base/metrics/gauge_test.go
@@ -74,7 +74,7 @@ func TestGauge(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			registry := NewKubeRegistry(apimachineryversion.Info{
+			registry := newKubeRegistry(apimachineryversion.Info{
 				Major:      "1",
 				Minor:      "15",
 				GitVersion: "v1.15.0-alpha-1.12345",
@@ -171,7 +171,7 @@ func TestGaugeVec(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			registry := NewKubeRegistry(apimachineryversion.Info{
+			registry := newKubeRegistry(apimachineryversion.Info{
 				Major:      "1",
 				Minor:      "15",
 				GitVersion: "v1.15.0-alpha-1.12345",

diff --git a/staging/src/k8s.io/component-base/metrics/histogram_test.go b/staging/src/k8s.io/component-base/metrics/histogram_test.go
@@ -78,7 +78,7 @@ func TestHistogram(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			registry := NewKubeRegistry(apimachineryversion.Info{
+			registry := newKubeRegistry(apimachineryversion.Info{
 				Major:      "1",
 				Minor:      "15",
 				GitVersion: "v1.15.0-alpha-1.12345",
@@ -179,7 +179,7 @@ func TestHistogramVec(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.desc, func(t *testing.T) {
-			registry := NewKubeRegistry(apimachineryversion.Info{
+			registry := newKubeRegistry(apimachineryversion.Info{
 				Major:      "1",
 				Minor:      "15",
 				GitVersion: "v1.15.0-alpha-1.12345",

diff --git a/staging/src/k8s.io/component-base/metrics/legacyregistry/BUILD b/staging/src/k8s.io/component-base/metrics/legacyregistry/BUILD
@@ -1,18 +1,16 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
     srcs = ["registry.go"],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/metrics/legacyregistry",
     importpath = "k8s.io/component-base/metrics/legacyregistry",
     deps = [
-        "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
         "//staging/src/k8s.io/component-base/metrics:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",
-        "//vendor/github.com/prometheus/client_model/go:go_default_library",
     ],
 )
 
@@ -28,16 +26,3 @@ filegroup(
     srcs = [":package-srcs"],
     tags = ["automanaged"],
 )
-
-go_test(
-    name = "go_default_test",
-    srcs = ["registry_test.go"],
-    embed = [":go_default_library"],
-    deps = [
-        "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
-        "//staging/src/k8s.io/component-base/metrics:go_default_library",
-        "//vendor/github.com/blang/semver:go_default_library",
-        "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-    ],
-)