diff --git a/staging/src/k8s.io/metrics/BUILD b/staging/src/k8s.io/metrics/BUILD index 287c69d2361..ed24b5f8fd8 100644 --- a/staging/src/k8s.io/metrics/BUILD +++ b/staging/src/k8s.io/metrics/BUILD @@ -13,6 +13,7 @@ filegroup( "//staging/src/k8s.io/metrics/pkg/apis/external_metrics:all-srcs", "//staging/src/k8s.io/metrics/pkg/apis/metrics:all-srcs", "//staging/src/k8s.io/metrics/pkg/client/clientset/versioned:all-srcs", + "//staging/src/k8s.io/metrics/pkg/client/clientset_test:all-srcs", "//staging/src/k8s.io/metrics/pkg/client/custom_metrics:all-srcs", "//staging/src/k8s.io/metrics/pkg/client/external_metrics:all-srcs", ], diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go index ea169f91150..442a81f7a88 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go @@ -18,5 +18,6 @@ limitations under the License. // +k8s:protobuf-gen=package // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics // +k8s:openapi-gen=true +// +groupName=metrics.k8s.io package v1alpha1 diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go index 49fc181914d..cdbab832e62 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go @@ -18,5 +18,6 @@ limitations under the License. // +k8s:protobuf-gen=package // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics // +k8s:openapi-gen=true +// +groupName=metrics.k8s.io package v1beta1 diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go index d061710ad02..51b967c2289 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go @@ -32,9 +32,9 @@ type FakeNodeMetricses struct { Fake *FakeMetricsV1alpha1 } -var nodemetricsesResource = schema.GroupVersionResource{Group: "metrics", Version: "v1alpha1", Resource: "nodes"} +var nodemetricsesResource = schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1alpha1", Resource: "nodes"} -var nodemetricsesKind = schema.GroupVersionKind{Group: "metrics", Version: "v1alpha1", Kind: "NodeMetrics"} +var nodemetricsesKind = schema.GroupVersionKind{Group: "metrics.k8s.io", Version: "v1alpha1", Kind: "NodeMetrics"} // Get takes name of the nodeMetrics, and returns the corresponding nodeMetrics object, and an error if there is any. func (c *FakeNodeMetricses) Get(name string, options v1.GetOptions) (result *v1alpha1.NodeMetrics, err error) { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go index 285f9eca5a8..923669400fb 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go @@ -33,9 +33,9 @@ type FakePodMetricses struct { ns string } -var podmetricsesResource = schema.GroupVersionResource{Group: "metrics", Version: "v1alpha1", Resource: "pods"} +var podmetricsesResource = schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1alpha1", Resource: "pods"} -var podmetricsesKind = schema.GroupVersionKind{Group: "metrics", Version: "v1alpha1", Kind: "PodMetrics"} +var podmetricsesKind = schema.GroupVersionKind{Group: "metrics.k8s.io", Version: "v1alpha1", Kind: "PodMetrics"} // Get takes name of the podMetrics, and returns the corresponding podMetrics object, and an error if there is any. func (c *FakePodMetricses) Get(name string, options v1.GetOptions) (result *v1alpha1.PodMetrics, err error) { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go index cd3e2cd8db0..f04274fbd44 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go @@ -31,7 +31,7 @@ type MetricsV1alpha1Interface interface { PodMetricsesGetter } -// MetricsV1alpha1Client is used to interact with features provided by the metrics group. +// MetricsV1alpha1Client is used to interact with features provided by the metrics.k8s.io group. type MetricsV1alpha1Client struct { restClient rest.Interface } diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go index 20303496567..cf7c5b92ef4 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go @@ -32,9 +32,9 @@ type FakeNodeMetricses struct { Fake *FakeMetricsV1beta1 } -var nodemetricsesResource = schema.GroupVersionResource{Group: "metrics", Version: "v1beta1", Resource: "nodes"} +var nodemetricsesResource = schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1beta1", Resource: "nodes"} -var nodemetricsesKind = schema.GroupVersionKind{Group: "metrics", Version: "v1beta1", Kind: "NodeMetrics"} +var nodemetricsesKind = schema.GroupVersionKind{Group: "metrics.k8s.io", Version: "v1beta1", Kind: "NodeMetrics"} // Get takes name of the nodeMetrics, and returns the corresponding nodeMetrics object, and an error if there is any. func (c *FakeNodeMetricses) Get(name string, options v1.GetOptions) (result *v1beta1.NodeMetrics, err error) { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go index d4855eb2873..0c7e07324b2 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go @@ -33,9 +33,9 @@ type FakePodMetricses struct { ns string } -var podmetricsesResource = schema.GroupVersionResource{Group: "metrics", Version: "v1beta1", Resource: "pods"} +var podmetricsesResource = schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1beta1", Resource: "pods"} -var podmetricsesKind = schema.GroupVersionKind{Group: "metrics", Version: "v1beta1", Kind: "PodMetrics"} +var podmetricsesKind = schema.GroupVersionKind{Group: "metrics.k8s.io", Version: "v1beta1", Kind: "PodMetrics"} // Get takes name of the podMetrics, and returns the corresponding podMetrics object, and an error if there is any. func (c *FakePodMetricses) Get(name string, options v1.GetOptions) (result *v1beta1.PodMetrics, err error) { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go index 359f49b44a4..039f5f9ba64 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go @@ -31,7 +31,7 @@ type MetricsV1beta1Interface interface { PodMetricsesGetter } -// MetricsV1beta1Client is used to interact with features provided by the metrics group. +// MetricsV1beta1Client is used to interact with features provided by the metrics.k8s.io group. type MetricsV1beta1Client struct { restClient rest.Interface } diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_test/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_test/BUILD new file mode 100644 index 00000000000..240c0868cdb --- /dev/null +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_test/BUILD @@ -0,0 +1,24 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_test") + +go_test( + name = "go_default_test", + srcs = ["clientset_test.go"], + deps = [ + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_test/clientset_test.go b/staging/src/k8s.io/metrics/pkg/client/clientset_test/clientset_test.go new file mode 100644 index 00000000000..38632b8aaf8 --- /dev/null +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_test/clientset_test.go @@ -0,0 +1,41 @@ +/* +Copyright 2019 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package clientset_test + +import ( + "testing" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/metrics/pkg/client/clientset/versioned/fake" +) + +// TestFakeList is a basic sanity check that makes sure the fake Clientset is working properly. +func TestFakeList(t *testing.T) { + client := fake.NewSimpleClientset() + if _, err := client.MetricsV1alpha1().PodMetricses("").List(metav1.ListOptions{}); err != nil { + t.Errorf("Unexpected error: %v", err) + } + if _, err := client.MetricsV1alpha1().NodeMetricses().List(metav1.ListOptions{}); err != nil { + t.Errorf("Unexpected error: %v", err) + } + if _, err := client.MetricsV1beta1().PodMetricses("").List(metav1.ListOptions{}); err != nil { + t.Errorf("Unexpected error: %v", err) + } + if _, err := client.MetricsV1beta1().NodeMetricses().List(metav1.ListOptions{}); err != nil { + t.Errorf("Unexpected error: %v", err) + } +}