Skip to content

Commit ab7e2ff

Browse files
author
Jonathan Basseri
committed
Fix fake clientsets in metrics.k8s.io.
The generated fake clientsets were using the API group "metrics" instead of "metrics.k8s.io". This patch includes a test that fails without the fix. The `+groupName` annotation needed to be copied to the v1alpha1 and v1beta1 packages to fix it. As a result, tests using this fake clientset work as expected.
1 parent df2094b commit ab7e2ff

File tree

11 files changed

+78
-10
lines changed

11 files changed

+78
-10
lines changed

staging/src/k8s.io/metrics/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ filegroup(
1313
"//staging/src/k8s.io/metrics/pkg/apis/external_metrics:all-srcs",
1414
"//staging/src/k8s.io/metrics/pkg/apis/metrics:all-srcs",
1515
"//staging/src/k8s.io/metrics/pkg/client/clientset/versioned:all-srcs",
16+
"//staging/src/k8s.io/metrics/pkg/client/clientset_test:all-srcs",
1617
"//staging/src/k8s.io/metrics/pkg/client/custom_metrics:all-srcs",
1718
"//staging/src/k8s.io/metrics/pkg/client/external_metrics:all-srcs",
1819
],

staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ limitations under the License.
1818
// +k8s:protobuf-gen=package
1919
// +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics
2020
// +k8s:openapi-gen=true
21+
// +groupName=metrics.k8s.io
2122

2223
package v1alpha1

staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ limitations under the License.
1818
// +k8s:protobuf-gen=package
1919
// +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics
2020
// +k8s:openapi-gen=true
21+
// +groupName=metrics.k8s.io
2122

2223
package v1beta1

staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go

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

staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go

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

staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go

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

staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go

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

staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go

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

staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_test")
2+
3+
go_test(
4+
name = "go_default_test",
5+
srcs = ["clientset_test.go"],
6+
deps = [
7+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
8+
"//staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake:go_default_library",
9+
],
10+
)
11+
12+
filegroup(
13+
name = "package-srcs",
14+
srcs = glob(["**"]),
15+
tags = ["automanaged"],
16+
visibility = ["//visibility:private"],
17+
)
18+
19+
filegroup(
20+
name = "all-srcs",
21+
srcs = [":package-srcs"],
22+
tags = ["automanaged"],
23+
visibility = ["//visibility:public"],
24+
)

0 commit comments

Comments
 (0)