Skip to content

Commit 15fc222

Browse files
SindicaSindica
committed
Fix openapi-spec version. UT fix
1 parent b4abbee commit 15fc222

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

‎api/openapi-spec/swagger.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hack/lib/version.sh‎

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

‎pkg/scheduler/internal/queue/multi_tenancy_scheduling_queue_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,6 +1114,7 @@ func TestPendingPodsMetricWithMultiTenancy(t *testing.T) {
11141114
total := 50
11151115
timestamp := time.Now()
11161116
var pInfos = make([]*framework.PodInfo, 0, total)
1117+
metrics.Register()
11171118
for i := 1; i <= total; i++ {
11181119
p := &framework.PodInfo{
11191120
Pod: &v1.Pod{
@@ -1209,9 +1210,9 @@ func TestPendingPodsMetricWithMultiTenancy(t *testing.T) {
12091210
}
12101211

12111212
resetMetrics := func() {
1212-
metrics.ActivePods.Set(0)
1213-
metrics.BackoffPods.Set(0)
1214-
metrics.UnschedulablePods.Set(0)
1213+
metrics.ActivePods().Set(0)
1214+
metrics.BackoffPods().Set(0)
1215+
metrics.UnschedulablePods().Set(0)
12151216
}
12161217

12171218
for _, test := range tests {
@@ -1226,23 +1227,23 @@ func TestPendingPodsMetricWithMultiTenancy(t *testing.T) {
12261227

12271228
var activeNum, backoffNum, unschedulableNum float64
12281229
metricProto := &dto.Metric{}
1229-
if err := metrics.ActivePods.Write(metricProto); err != nil {
1230+
if err := metrics.ActivePods().Write(metricProto); err != nil {
12301231
t.Errorf("error writing ActivePods metric: %v", err)
12311232
}
12321233
activeNum = metricProto.Gauge.GetValue()
12331234
if int64(activeNum) != test.expected[0] {
12341235
t.Errorf("ActivePods: Expected %v, got %v", test.expected[0], activeNum)
12351236
}
12361237

1237-
if err := metrics.BackoffPods.Write(metricProto); err != nil {
1238+
if err := metrics.BackoffPods().Write(metricProto); err != nil {
12381239
t.Errorf("error writing BackoffPods metric: %v", err)
12391240
}
12401241
backoffNum = metricProto.Gauge.GetValue()
12411242
if int64(backoffNum) != test.expected[1] {
12421243
t.Errorf("BackoffPods: Expected %v, got %v", test.expected[1], backoffNum)
12431244
}
12441245

1245-
if err := metrics.UnschedulablePods.Write(metricProto); err != nil {
1246+
if err := metrics.UnschedulablePods().Write(metricProto); err != nil {
12461247
t.Errorf("error writing UnschedulablePods metric: %v", err)
12471248
}
12481249
unschedulableNum = metricProto.Gauge.GetValue()

‎staging/src/k8s.io/apiserver/pkg/admission/metrics/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ go_test(
2525
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
2626
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
2727
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
28-
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
28+
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
2929
"//vendor/github.com/prometheus/client_model/go:go_default_library",
3030
],
3131
)

‎staging/src/k8s.io/apiserver/pkg/admission/metrics/testutil_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright 2017 The Kubernetes Authors.
3+
Copyright 2020 Authors of Arktos - file modified.
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -17,9 +18,9 @@ limitations under the License.
1718
package metrics
1819

1920
import (
21+
"k8s.io/component-base/metrics/legacyregistry"
2022
"testing"
2123

22-
"github.com/prometheus/client_golang/prometheus"
2324
ptype "github.com/prometheus/client_model/go"
2425
)
2526

@@ -34,7 +35,7 @@ func labelsMatch(metric *ptype.Metric, labelFilter map[string]string) bool {
3435

3536
// expectFindMetric find a metric with the given name nad labels or reports a fatal test error.
3637
func expectFindMetric(t *testing.T, name string, expectedLabels map[string]string) *ptype.Metric {
37-
metrics, err := prometheus.DefaultGatherer.Gather()
38+
metrics, err := legacyregistry.DefaultGatherer.Gather()
3839
if err != nil {
3940
t.Fatalf("Failed to gather metrics: %s", err)
4041
}
@@ -61,7 +62,7 @@ func expectFindMetric(t *testing.T, name string, expectedLabels map[string]strin
6162
// expectHistogramCountTotal ensures that the sum of counts of metrics matching the labelFilter is as
6263
// expected.
6364
func expectHistogramCountTotal(t *testing.T, name string, labelFilter map[string]string, wantCount int) {
64-
metrics, err := prometheus.DefaultGatherer.Gather()
65+
metrics, err := legacyregistry.DefaultGatherer.Gather()
6566
if err != nil {
6667
t.Fatalf("Failed to gather metrics: %s", err)
6768
}

‎staging/src/k8s.io/apiserver/pkg/storage/value/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ go_test(
1414
],
1515
embed = [":go_default_library"],
1616
deps = [
17-
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
17+
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
1818
"//vendor/github.com/prometheus/client_golang/prometheus/testutil:go_default_library",
1919
"//vendor/google.golang.org/grpc/codes:go_default_library",
2020
"//vendor/google.golang.org/grpc/status:go_default_library",

‎staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ package value
1818

1919
import (
2020
"errors"
21+
"k8s.io/component-base/metrics/legacyregistry"
2122
"strings"
2223
"testing"
2324
"time"
2425

2526
"google.golang.org/grpc/codes"
2627
"google.golang.org/grpc/status"
2728

28-
"github.com/prometheus/client_golang/prometheus"
2929
"github.com/prometheus/client_golang/prometheus/testutil"
3030
)
3131

@@ -89,7 +89,7 @@ func TestTotals(t *testing.T) {
8989
RecordTransformation("encrypt", "k8s:enc:kms:v1:", time.Now(), tt.error)
9090
defer transformerOperationsTotal.Reset()
9191
defer deprecatedTransformerFailuresTotal.Reset()
92-
if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil {
92+
if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil {
9393
t.Fatal(err)
9494
}
9595
})

‎staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package value
1919
import (
2020
"bytes"
2121
"fmt"
22+
"k8s.io/component-base/metrics/legacyregistry"
2223
"strings"
2324
"testing"
2425

25-
"github.com/prometheus/client_golang/prometheus"
2626
"github.com/prometheus/client_golang/prometheus/testutil"
2727
)
2828

@@ -185,7 +185,7 @@ func TestPrefixFromMetrics(t *testing.T) {
185185
t.Run(tc.desc, func(t *testing.T) {
186186
tc.prefix.TransformFromStorage(tc.input, nil)
187187
defer transformerOperationsTotal.Reset()
188-
if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil {
188+
if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil {
189189
t.Fatal(err)
190190
}
191191
})
@@ -243,7 +243,7 @@ func TestPrefixToMetrics(t *testing.T) {
243243
t.Run(tc.desc, func(t *testing.T) {
244244
tc.prefix.TransformToStorage(tc.input, nil)
245245
defer transformerOperationsTotal.Reset()
246-
if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil {
246+
if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil {
247247
t.Fatal(err)
248248
}
249249
})

0 commit comments

Comments
 (0)