Skip to content

Commit fa9e1d2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#81173 from logicalhan/shared-metrics
Migrate shared metrics into component base
2 parents 59f5b3d + 94b612f commit fa9e1d2

File tree

37 files changed

+834
-345
lines changed

37 files changed

+834
-345
lines changed

‎hack/lib/version.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ kube::version::ldflags() {
161161
"-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/client-go/pkg/version.${key}=${val}'"
162162
"-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/kubectl/pkg/version.${key}=${val}'"
163163
"-X '${KUBE_GO_PACKAGE}/cmd/kubeadm/app/version.${key}=${val}'"
164+
"-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/component-base/version.${key}=${val}'"
164165
)
165166
}
166167

‎staging/publishing/import-restrictions.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
allowedImports:
5757
- k8s.io/apimachinery
5858
- k8s.io/component-base
59+
- k8s.io/client-go
60+
- k8s.io/client-go/tools/
5961
- k8s.io/klog
6062
- k8s.io/utils
6163

‎staging/publishing/rules.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ rules:
110110
dependencies:
111111
- repository: apimachinery
112112
branch: master
113+
- repository: api
114+
branch: master
115+
- repository: client-go
116+
branch: master
113117
- source:
114118
branch: release-1.15
115119
dir: staging/src/k8s.io/component-base
@@ -540,6 +544,10 @@ rules:
540544
branch: master
541545
- repository: component-base
542546
branch: master
547+
- repository: api
548+
branch: master
549+
- repository: client-go
550+
branch: master
543551
- source:
544552
branch: release-1.15
545553
dir: staging/src/k8s.io/kube-proxy
@@ -604,6 +612,10 @@ rules:
604612
branch: master
605613
- repository: component-base
606614
branch: master
615+
- repository: api
616+
branch: master
617+
- repository: client-go
618+
branch: master
607619
- source:
608620
branch: release-1.15
609621
dir: staging/src/k8s.io/kube-scheduler
@@ -636,6 +648,10 @@ rules:
636648
branch: master
637649
- repository: component-base
638650
branch: master
651+
- repository: api
652+
branch: master
653+
- repository: client-go
654+
branch: master
639655
- source:
640656
branch: release-1.15
641657
dir: staging/src/k8s.io/kube-controller-manager

‎staging/src/k8s.io/component-base/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ filegroup(
1515
"//staging/src/k8s.io/component-base/featuregate:all-srcs",
1616
"//staging/src/k8s.io/component-base/logs:all-srcs",
1717
"//staging/src/k8s.io/component-base/metrics:all-srcs",
18+
"//staging/src/k8s.io/component-base/version:all-srcs",
1819
],
1920
tags = ["automanaged"],
2021
visibility = ["//visibility:public"],

‎staging/src/k8s.io/component-base/go.mod‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ require (
1313
github.com/spf13/pflag v1.0.3
1414
github.com/stretchr/testify v1.3.0
1515
k8s.io/apimachinery v0.0.0
16+
k8s.io/client-go v0.0.0
1617
k8s.io/klog v0.4.0
1718
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
1819
)
1920

2021
replace (
22+
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
2123
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
2224
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
2325
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
26+
k8s.io/api => ../api
2427
k8s.io/apimachinery => ../apimachinery
28+
k8s.io/client-go => ../client-go
2529
k8s.io/component-base => ../component-base
2630
)

‎staging/src/k8s.io/component-base/go.sum‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/component-base/metrics/BUILD‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ load(
55
"go_library",
66
"go_test",
77
)
8+
load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs")
89

910
go_library(
1011
name = "go_default_library",
@@ -17,13 +18,15 @@ go_library(
1718
"processstarttime.go",
1819
"registry.go",
1920
"summary.go",
21+
"version.go",
2022
"version_parser.go",
2123
"wrappers.go",
2224
],
2325
importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/metrics",
2426
importpath = "k8s.io/component-base/metrics",
2527
deps = [
2628
"//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
29+
"//staging/src/k8s.io/component-base/version:go_default_library",
2730
"//vendor/github.com/blang/semver:go_default_library",
2831
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
2932
"//vendor/github.com/prometheus/client_model/go:go_default_library",
@@ -64,6 +67,9 @@ filegroup(
6467
srcs = [
6568
":package-srcs",
6669
"//staging/src/k8s.io/component-base/metrics/legacyregistry:all-srcs",
70+
"//staging/src/k8s.io/component-base/metrics/prometheus/clientgo:all-srcs",
71+
"//staging/src/k8s.io/component-base/metrics/prometheus/restclient:all-srcs",
72+
"//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:all-srcs",
6773
],
6874
tags = ["automanaged"],
6975
)

‎staging/src/k8s.io/component-base/metrics/counter_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestCounter(t *testing.T) {
7272

7373
for _, test := range tests {
7474
t.Run(test.desc, func(t *testing.T) {
75-
registry := NewKubeRegistry(apimachineryversion.Info{
75+
registry := newKubeRegistry(apimachineryversion.Info{
7676
Major: "1",
7777
Minor: "15",
7878
GitVersion: "v1.15.0-alpha-1.12345",
@@ -184,7 +184,7 @@ func TestCounterVec(t *testing.T) {
184184

185185
for _, test := range tests {
186186
t.Run(test.desc, func(t *testing.T) {
187-
registry := NewKubeRegistry(apimachineryversion.Info{
187+
registry := newKubeRegistry(apimachineryversion.Info{
188188
Major: "1",
189189
Minor: "15",
190190
GitVersion: "v1.15.0-alpha-1.12345",

‎staging/src/k8s.io/component-base/metrics/gauge_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestGauge(t *testing.T) {
7373

7474
for _, test := range tests {
7575
t.Run(test.desc, func(t *testing.T) {
76-
registry := NewKubeRegistry(apimachineryversion.Info{
76+
registry := newKubeRegistry(apimachineryversion.Info{
7777
Major: "1",
7878
Minor: "15",
7979
GitVersion: "v1.15.0-alpha-1.12345",
@@ -169,7 +169,7 @@ func TestGaugeVec(t *testing.T) {
169169

170170
for _, test := range tests {
171171
t.Run(test.desc, func(t *testing.T) {
172-
registry := NewKubeRegistry(apimachineryversion.Info{
172+
registry := newKubeRegistry(apimachineryversion.Info{
173173
Major: "1",
174174
Minor: "15",
175175
GitVersion: "v1.15.0-alpha-1.12345",

‎staging/src/k8s.io/component-base/metrics/histogram_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestHistogram(t *testing.T) {
7777

7878
for _, test := range tests {
7979
t.Run(test.desc, func(t *testing.T) {
80-
registry := NewKubeRegistry(apimachineryversion.Info{
80+
registry := newKubeRegistry(apimachineryversion.Info{
8181
Major: "1",
8282
Minor: "15",
8383
GitVersion: "v1.15.0-alpha-1.12345",
@@ -177,7 +177,7 @@ func TestHistogramVec(t *testing.T) {
177177

178178
for _, test := range tests {
179179
t.Run(test.desc, func(t *testing.T) {
180-
registry := NewKubeRegistry(apimachineryversion.Info{
180+
registry := newKubeRegistry(apimachineryversion.Info{
181181
Major: "1",
182182
Minor: "15",
183183
GitVersion: "v1.15.0-alpha-1.12345",

0 commit comments

Comments
 (0)