From 78d0f1827acfb8400d6e1622d55bdfed64b047ed Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Wed, 9 Oct 2019 21:58:51 +0800 Subject: [PATCH 1/2] Remove direct reference to prometheus from apiserver/pkg/storage/value. --- .../k8s.io/apiserver/pkg/storage/value/metrics_test.go | 6 +++--- .../apiserver/pkg/storage/value/transformer_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go index c4feb98fd6d..22109bb2a9e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go @@ -24,8 +24,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/testutil" + "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/metrics/testutil" ) func TestTotals(t *testing.T) { @@ -122,7 +122,7 @@ apiserver_storage_transformation_operations_total{status="Internal",transformati tt.prefix.TransformFromStorage([]byte("k8s:enc:kms:v1:value"), nil) defer transformerOperationsTotal.Reset() defer deprecatedTransformerFailuresTotal.Reset() - if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil { + if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil { t.Fatal(err) } }) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go index 08b3275086e..f044da4fbbf 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/testutil" + "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/metrics/testutil" ) type testTransformer struct { @@ -185,7 +185,7 @@ func TestPrefixFromMetrics(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { tc.prefix.TransformFromStorage(tc.input, nil) defer transformerOperationsTotal.Reset() - if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { + if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { t.Fatal(err) } }) @@ -243,7 +243,7 @@ func TestPrefixToMetrics(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { tc.prefix.TransformToStorage(tc.input, nil) defer transformerOperationsTotal.Reset() - if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { + if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { t.Fatal(err) } }) From 6764bf394856a0d0979131bf985ce73cec4da72a Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Wed, 9 Oct 2019 22:01:46 +0800 Subject: [PATCH 2/2] Deal with auto-generated files. - Update bazel by hack/update-bazel.sh - Update vendor by hack/update-vendor.sh --- staging/src/k8s.io/apiserver/go.mod | 1 - staging/src/k8s.io/apiserver/pkg/storage/value/BUILD | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 67b236a1e0e..f29915d52de 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -29,7 +29,6 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 github.com/pborman/uuid v1.2.0 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect - github.com/prometheus/client_golang v0.9.4 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 github.com/sirupsen/logrus v1.4.2 // indirect github.com/soheilhy/cmux v0.1.3 // indirect diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD index ed48a59fc7b..ffe57c748f3 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD @@ -14,8 +14,8 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus/testutil:go_default_library", + "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/component-base/metrics/testutil:go_default_library", "//vendor/google.golang.org/grpc/codes:go_default_library", "//vendor/google.golang.org/grpc/status:go_default_library", ],