From 57036f90aacad8a12acbdbcd1144837c971e7b80 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 29 Jun 2018 21:16:01 +0200 Subject: [PATCH] k8s.io/metrics: normalize client dir --- .../versioned}/clientset.go | 6 +-- .../clientset => clientset/versioned}/doc.go | 2 +- .../versioned}/fake/clientset_generated.go | 10 ++-- .../versioned}/fake/doc.go | 0 .../versioned}/fake/register.go | 0 .../versioned}/scheme/doc.go | 0 .../versioned}/scheme/register.go | 0 .../versioned}/typed/metrics/v1alpha1/doc.go | 0 .../typed/metrics/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_metrics_client.go | 2 +- .../metrics/v1alpha1/fake/fake_nodemetrics.go | 0 .../metrics/v1alpha1/fake/fake_podmetrics.go | 0 .../metrics/v1alpha1/generated_expansion.go | 0 .../typed/metrics/v1alpha1/metrics_client.go | 2 +- .../typed/metrics/v1alpha1/nodemetrics.go | 2 +- .../typed/metrics/v1alpha1/podmetrics.go | 2 +- .../versioned}/typed/metrics/v1beta1/doc.go | 0 .../typed/metrics/v1beta1/fake/doc.go | 0 .../v1beta1/fake/fake_metrics_client.go | 2 +- .../metrics/v1beta1/fake/fake_nodemetrics.go | 0 .../metrics/v1beta1/fake/fake_podmetrics.go | 0 .../metrics/v1beta1/generated_expansion.go | 0 .../typed/metrics/v1beta1/metrics_client.go | 2 +- .../typed/metrics/v1beta1/nodemetrics.go | 2 +- .../typed/metrics/v1beta1/podmetrics.go | 2 +- .../clientset_generated/clientset/BUILD | 42 ----------------- .../clientset_generated/clientset/fake/BUILD | 47 ------------------- .../clientset/scheme/BUILD | 37 --------------- .../clientset/typed/metrics/v1alpha1/BUILD | 43 ----------------- .../typed/metrics/v1alpha1/fake/BUILD | 41 ---------------- .../clientset/typed/metrics/v1beta1/BUILD | 40 ---------------- .../typed/metrics/v1beta1/fake/BUILD | 38 --------------- 32 files changed, 17 insertions(+), 305 deletions(-) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/clientset.go (94%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/doc.go (97%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/fake/clientset_generated.go (85%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/fake/doc.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/fake/register.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/scheme/doc.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/scheme/register.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/doc.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/fake/doc.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/fake/fake_metrics_client.go (93%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/fake/fake_nodemetrics.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/fake/fake_podmetrics.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/generated_expansion.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/metrics_client.go (97%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/nodemetrics.go (97%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1alpha1/podmetrics.go (97%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/doc.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/fake/doc.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/fake/fake_metrics_client.go (93%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/fake/fake_nodemetrics.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/fake/fake_podmetrics.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/generated_expansion.go (100%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/metrics_client.go (97%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/nodemetrics.go (97%) rename staging/src/k8s.io/metrics/pkg/client/{clientset_generated/clientset => clientset/versioned}/typed/metrics/v1beta1/podmetrics.go (97%) delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/BUILD delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/BUILD delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/BUILD delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/BUILD delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/BUILD delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/BUILD delete mode 100644 staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/BUILD diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go similarity index 94% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go index e9a9b600669..309b3207d1b 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go @@ -16,14 +16,14 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package clientset +package versioned import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - metricsv1alpha1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1" - metricsv1beta1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1" + metricsv1alpha1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1" + metricsv1beta1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1" ) type Interface interface { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/doc.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/doc.go index ee865e56d1d..41721ca52d4 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/doc.go @@ -17,4 +17,4 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. // This package has the automatically generated clientset. -package clientset +package versioned diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 85% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/clientset_generated.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go index d9950371b19..aa066c49a30 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -24,11 +24,11 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/metrics/pkg/client/clientset_generated/clientset" - metricsv1alpha1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1" - fakemetricsv1alpha1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake" - metricsv1beta1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1" - fakemetricsv1beta1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake" + clientset "k8s.io/metrics/pkg/client/clientset/versioned" + metricsv1alpha1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1" + fakemetricsv1alpha1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake" + metricsv1beta1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1" + fakemetricsv1beta1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/doc.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/register.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/register.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/register.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/register.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/doc.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/register.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/register.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/register.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/register.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/doc.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/doc.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/doc.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/doc.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_metrics_client.go similarity index 93% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_metrics_client.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_metrics_client.go index be7103f6a6c..e4e8c798752 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_metrics_client.go @@ -21,7 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1" + v1alpha1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1" ) type FakeMetricsV1alpha1 struct { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_nodemetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_nodemetrics.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/fake_podmetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake/fake_podmetrics.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/generated_expansion.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/generated_expansion.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/generated_expansion.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/generated_expansion.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/metrics_client.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go index a1ba2f52d30..cd3e2cd8db0 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go @@ -22,7 +22,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/metrics/pkg/apis/metrics/v1alpha1" - "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme" + "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) type MetricsV1alpha1Interface interface { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/nodemetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go index c53e95f8102..0f88e58605a 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go @@ -23,7 +23,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/metrics/pkg/apis/metrics/v1alpha1" - scheme "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme" + scheme "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) // NodeMetricsesGetter has a method to return a NodeMetricsInterface. diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/podmetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go index f030b9ddc63..e11182eb741 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go @@ -23,7 +23,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/metrics/pkg/apis/metrics/v1alpha1" - scheme "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme" + scheme "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) // PodMetricsesGetter has a method to return a PodMetricsInterface. diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/doc.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/doc.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/doc.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/doc.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/doc.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_metrics_client.go similarity index 93% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_metrics_client.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_metrics_client.go index 09fc39d4923..415e022cc52 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_metrics_client.go @@ -21,7 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1" + v1beta1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1" ) type FakeMetricsV1beta1 struct { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_nodemetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_nodemetrics.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/fake_podmetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake/fake_podmetrics.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/generated_expansion.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/generated_expansion.go similarity index 100% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/generated_expansion.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/generated_expansion.go diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/metrics_client.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go index 7353ddbbcda..359f49b44a4 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go @@ -22,7 +22,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" v1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1" - "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme" + "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) type MetricsV1beta1Interface interface { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/nodemetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go index a7b69a527e5..845914133cc 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go @@ -23,7 +23,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" v1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1" - scheme "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme" + scheme "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) // NodeMetricsesGetter has a method to return a NodeMetricsInterface. diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go similarity index 97% rename from staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/podmetrics.go rename to staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go index 1a7ae248e73..02e4e0a0d7d 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go @@ -23,7 +23,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" v1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1" - scheme "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme" + scheme "k8s.io/metrics/pkg/client/clientset/versioned/scheme" ) // PodMetricsesGetter has a method to return a PodMetricsInterface. diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/BUILD deleted file mode 100644 index eec9e3ccf43..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "clientset.go", - "doc.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset", - deps = [ - "//staging/src/k8s.io/client-go/discovery:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:all-srcs", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme:all-srcs", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:all-srcs", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/BUILD deleted file mode 100644 index 64ae8b7eb1c..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "clientset_generated.go", - "doc.go", - "register.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake", - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//staging/src/k8s.io/client-go/discovery:go_default_library", - "//staging/src/k8s.io/client-go/discovery/fake:go_default_library", - "//staging/src/k8s.io/client-go/testing:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/BUILD deleted file mode 100644 index ca8785e0224..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/BUILD +++ /dev/null @@ -1,37 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "register.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme", - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/BUILD deleted file mode 100644 index c70f99fd890..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/BUILD +++ /dev/null @@ -1,43 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "generated_expansion.go", - "metrics_client.go", - "nodemetrics.go", - "podmetrics.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1", - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/BUILD deleted file mode 100644 index 9e3ab2fb9dd..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "fake_metrics_client.go", - "fake_nodemetrics.go", - "fake_podmetrics.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake", - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/client-go/testing:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/BUILD deleted file mode 100644 index f4d0a6b8437..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/BUILD +++ /dev/null @@ -1,40 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "generated_expansion.go", - "metrics_client.go", - "nodemetrics.go", - "podmetrics.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake:all-srcs", - ], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/BUILD b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/BUILD deleted file mode 100644 index bb3de0f5aa7..00000000000 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/BUILD +++ /dev/null @@ -1,38 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "fake_metrics_client.go", - "fake_nodemetrics.go", - "fake_podmetrics.go", - ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake", - importpath = "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/client-go/testing:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", - "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1: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"], -)