From 6709b7ada2ff677bf78b32868c4f6b90aa89f65d Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 13 Dec 2016 19:39:50 -0800 Subject: [PATCH] run hack/update-codegen.sh run hack/verify-gofmt.sh update bazel --- cmd/kubemark/BUILD | 2 +- cmd/kubemark/hollow-node.go | 2 +- cmd/kubernetes-discovery/pkg/apiserver/BUILD | 2 +- .../pkg/apiserver/apiserver.go | 2 +- .../clientset_generated/clientset/clientset.go | 2 +- .../client/clientset_generated/clientset/doc.go | 4 ++-- .../clientset_generated/clientset/fake/doc.go | 2 +- .../typed/apiregistration/v1alpha1/doc.go | 2 +- .../typed/apiregistration/v1alpha1/fake/doc.go | 2 +- .../pkg/client/informers/BUILD | 2 +- .../apiregistration/v1alpha1/apiservice.go | 4 ++-- .../pkg/client/informers/factory.go | 6 +++--- .../pkg/client/informers/internalinterfaces/BUILD | 2 +- .../internalinterfaces/internal_interfaces.go | 4 ++-- .../clientset_generated/federation_clientset/BUILD | 6 +++--- .../federation_clientset/clientset.go | 8 ++++---- .../federation_clientset/doc.go | 4 ++-- .../federation_clientset/fake/BUILD | 14 +++++++------- .../fake/clientset_generated.go | 14 +++++++------- .../federation_clientset/fake/doc.go | 2 +- .../federation_clientset/typed/core/v1/doc.go | 2 +- .../federation_clientset/typed/core/v1/fake/BUILD | 2 +- .../federation_clientset/typed/core/v1/fake/doc.go | 2 +- .../typed/core/v1/fake/fake_core_client.go | 2 +- .../typed/extensions/v1beta1/doc.go | 2 +- .../typed/extensions/v1beta1/fake/BUILD | 2 +- .../typed/extensions/v1beta1/fake/doc.go | 2 +- .../v1beta1/fake/fake_extensions_client.go | 2 +- .../typed/federation/v1beta1/doc.go | 2 +- .../typed/federation/v1beta1/fake/BUILD | 2 +- .../typed/federation/v1beta1/fake/doc.go | 2 +- .../v1beta1/fake/fake_federation_client.go | 2 +- .../cmd/federation-controller-manager/app/BUILD | 2 +- federation/pkg/federation-controller/cluster/BUILD | 4 ++-- .../pkg/federation-controller/configmap/BUILD | 4 ++-- .../pkg/federation-controller/daemonset/BUILD | 4 ++-- .../pkg/federation-controller/deployment/BUILD | 4 ++-- federation/pkg/federation-controller/ingress/BUILD | 4 ++-- .../pkg/federation-controller/namespace/BUILD | 4 ++-- .../pkg/federation-controller/replicaset/BUILD | 4 ++-- federation/pkg/federation-controller/secret/BUILD | 4 ++-- federation/pkg/federation-controller/service/BUILD | 2 +- federation/pkg/federation-controller/util/BUILD | 6 +++--- .../pkg/federation-controller/util/eventsink/BUILD | 4 ++-- .../clientset_generated/clientset/clientset.go | 2 +- pkg/client/clientset_generated/clientset/doc.go | 4 ++-- .../clientset_generated/clientset/fake/doc.go | 2 +- .../clientset/typed/apps/v1beta1/doc.go | 2 +- .../clientset/typed/apps/v1beta1/fake/doc.go | 2 +- .../clientset/typed/authentication/v1beta1/doc.go | 2 +- .../typed/authentication/v1beta1/fake/doc.go | 2 +- .../clientset/typed/authorization/v1beta1/doc.go | 2 +- .../typed/authorization/v1beta1/fake/doc.go | 2 +- .../clientset/typed/autoscaling/v1/doc.go | 2 +- .../clientset/typed/autoscaling/v1/fake/doc.go | 2 +- .../clientset/typed/batch/v1/doc.go | 2 +- .../clientset/typed/batch/v1/fake/doc.go | 2 +- .../clientset/typed/batch/v2alpha1/doc.go | 2 +- .../clientset/typed/batch/v2alpha1/fake/doc.go | 2 +- .../clientset/typed/certificates/v1alpha1/doc.go | 2 +- .../typed/certificates/v1alpha1/fake/doc.go | 2 +- .../clientset/typed/core/v1/doc.go | 2 +- .../clientset/typed/core/v1/fake/doc.go | 2 +- .../clientset/typed/extensions/v1beta1/doc.go | 2 +- .../clientset/typed/extensions/v1beta1/fake/doc.go | 2 +- .../clientset/typed/policy/v1beta1/doc.go | 2 +- .../clientset/typed/policy/v1beta1/fake/doc.go | 2 +- .../clientset/typed/rbac/v1alpha1/doc.go | 2 +- .../clientset/typed/rbac/v1alpha1/fake/doc.go | 2 +- .../clientset/typed/storage/v1beta1/doc.go | 2 +- .../clientset/typed/storage/v1beta1/fake/doc.go | 2 +- pkg/client/informers/informers_generated/BUILD | 2 +- .../apps/v1beta1/statefulset.go | 4 ++-- .../autoscaling/v1/horizontalpodautoscaler.go | 4 ++-- .../informers/informers_generated/batch/v1/job.go | 4 ++-- .../informers_generated/batch/v2alpha1/cronjob.go | 4 ++-- .../informers_generated/batch/v2alpha1/job.go | 4 ++-- .../v1alpha1/certificatesigningrequest.go | 4 ++-- .../informers_generated/core/v1/componentstatus.go | 4 ++-- .../informers_generated/core/v1/configmap.go | 4 ++-- .../informers_generated/core/v1/endpoints.go | 4 ++-- .../informers/informers_generated/core/v1/event.go | 4 ++-- .../informers_generated/core/v1/limitrange.go | 4 ++-- .../informers_generated/core/v1/namespace.go | 4 ++-- .../informers/informers_generated/core/v1/node.go | 4 ++-- .../core/v1/persistentvolume.go | 4 ++-- .../core/v1/persistentvolumeclaim.go | 4 ++-- .../informers/informers_generated/core/v1/pod.go | 4 ++-- .../informers_generated/core/v1/podtemplate.go | 4 ++-- .../core/v1/replicationcontroller.go | 4 ++-- .../informers_generated/core/v1/resourcequota.go | 4 ++-- .../informers_generated/core/v1/secret.go | 4 ++-- .../informers_generated/core/v1/service.go | 4 ++-- .../informers_generated/core/v1/serviceaccount.go | 4 ++-- .../extensions/v1beta1/daemonset.go | 4 ++-- .../extensions/v1beta1/deployment.go | 4 ++-- .../extensions/v1beta1/ingress.go | 4 ++-- .../informers_generated/extensions/v1beta1/job.go | 4 ++-- .../extensions/v1beta1/podsecuritypolicy.go | 4 ++-- .../extensions/v1beta1/replicaset.go | 4 ++-- .../extensions/v1beta1/thirdpartyresource.go | 4 ++-- .../informers/informers_generated/factory.go | 6 +++--- .../informers_generated/internalinterfaces/BUILD | 2 +- .../internalinterfaces/internal_interfaces.go | 4 ++-- .../policy/v1beta1/poddisruptionbudget.go | 4 ++-- .../rbac/v1alpha1/clusterrole.go | 4 ++-- .../rbac/v1alpha1/clusterrolebinding.go | 4 ++-- .../informers_generated/rbac/v1alpha1/role.go | 4 ++-- .../rbac/v1alpha1/rolebinding.go | 4 ++-- .../storage/v1beta1/storageclass.go | 4 ++-- pkg/controller/informers/BUILD | 2 +- pkg/controller/informers/core.go | 2 +- pkg/controller/informers/factory.go | 2 +- pkg/kubectl/BUILD | 8 ++++---- pkg/kubectl/describe.go | 2 +- pkg/kubectl/describe_test.go | 2 +- pkg/kubectl/versioned_client.go | 2 +- pkg/kubemark/BUILD | 2 +- pkg/master/BUILD | 4 ++-- pkg/master/master.go | 2 +- test/e2e/BUILD | 6 +++--- test/e2e/autoscaling_utils.go | 2 +- test/e2e/density.go | 2 +- test/e2e/deployment.go | 2 +- test/e2e/framework/BUILD | 4 ++-- test/e2e/framework/framework.go | 2 +- test/e2e/framework/util.go | 2 +- test/e2e/load.go | 2 +- test/e2e/service.go | 2 +- test/integration/framework/BUILD | 2 +- test/integration/framework/master_utils.go | 2 +- test/integration/master/master_test.go | 2 +- test/integration/quota/quota_test.go | 2 +- .../serviceaccount/service_account_test.go | 2 +- test/utils/BUILD | 2 +- test/utils/runners.go | 2 +- 136 files changed, 216 insertions(+), 216 deletions(-) diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 27a35e02a8d..f294cebdc41 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -13,8 +13,8 @@ go_binary( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 8368088d3e4..c7a32c3b7d6 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -20,8 +20,8 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/cmd/kubernetes-discovery/pkg/apiserver/BUILD b/cmd/kubernetes-discovery/pkg/apiserver/BUILD index e92ef886e07..05b0752c848 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/BUILD +++ b/cmd/kubernetes-discovery/pkg/apiserver/BUILD @@ -20,8 +20,8 @@ go_library( deps = [ "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", + "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", "//cmd/kubernetes-discovery/pkg/client/informers:go_default_library", "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library", "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/apiserver/apiserver.go b/cmd/kubernetes-discovery/pkg/apiserver/apiserver.go index 613f4d6ec03..0ddd1a91755 100644 --- a/cmd/kubernetes-discovery/pkg/apiserver/apiserver.go +++ b/cmd/kubernetes-discovery/pkg/apiserver/apiserver.go @@ -33,8 +33,8 @@ import ( "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" - "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers" listers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion" apiservicestorage "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go index 69e29655a26..d5342f2b4ac 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go +++ b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package release_1_5 +package clientset import ( "github.com/golang/glog" diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go index 3246f356411..23549b5bb73 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go +++ b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis // This package has the automatically generated clientset. -package release_1_5 +package clientset diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go index affb802d2aa..08b89726e9f 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go +++ b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis // This package has the automatically generated fake clientset. package fake diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go index 415ba39f8c9..f1a27b20df4 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go +++ b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis // This package has the automatically generated typed clients. package v1alpha1 diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go index 84431690b7f..db2ac247b3b 100644 --- a/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go +++ b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis +// This package is generated by client-gen with arguments: --clientset-name=clientset --clientset-path=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated --input=[apiregistration/v1alpha1] --input-base=k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis // Package fake has the automatically generated clients. package fake diff --git a/cmd/kubernetes-discovery/pkg/client/informers/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/BUILD index a2ca7f752dc..276bb5b7f81 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/BUILD +++ b/cmd/kubernetes-discovery/pkg/client/informers/BUILD @@ -17,8 +17,8 @@ go_library( deps = [ "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library", "//cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1:go_default_library", - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", + "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration:go_default_library", "//cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go index b13f842e48b..5ee59ad5ea2 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go +++ b/cmd/kubernetes-discovery/pkg/client/informers/apiregistration/v1alpha1/apiservice.go @@ -20,7 +20,7 @@ package v1alpha1 import ( apiregistration_v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1" - release_1_5 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" v1alpha1 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/v1alpha1" v1 "k8s.io/kubernetes/pkg/api/v1" @@ -41,7 +41,7 @@ type aPIServiceInformer struct { factory internalinterfaces.SharedInformerFactory } -func newAPIServiceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newAPIServiceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/cmd/kubernetes-discovery/pkg/client/informers/factory.go b/cmd/kubernetes-discovery/pkg/client/informers/factory.go index bfc5b602f7b..764bb16b6c5 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/factory.go +++ b/cmd/kubernetes-discovery/pkg/client/informers/factory.go @@ -19,8 +19,8 @@ limitations under the License. package informers import ( + clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - release_1_5 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" apiregistration "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/apiregistration" internalinterfaces "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces" cache "k8s.io/kubernetes/pkg/client/cache" @@ -32,7 +32,7 @@ import ( type sharedInformerFactory struct { internalClient internalclientset.Interface - versionedClient release_1_5.Interface + versionedClient clientset.Interface lock sync.Mutex defaultResync time.Duration @@ -43,7 +43,7 @@ type sharedInformerFactory struct { } // NewSharedInformerFactory constructs a new instance of sharedInformerFactory -func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient release_1_5.Interface, defaultResync time.Duration) SharedInformerFactory { +func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient clientset.Interface, defaultResync time.Duration) SharedInformerFactory { return &sharedInformerFactory{ internalClient: internalClient, versionedClient: versionedClient, diff --git a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD index f471ecd0f5c..162f7c2993c 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD +++ b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["internal_interfaces.go"], tags = ["automanaged"], deps = [ - "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", "//cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset:go_default_library", + "//cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/runtime:go_default_library", ], diff --git a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go index 794b7def4c4..257d1dae92f 100644 --- a/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go +++ b/cmd/kubernetes-discovery/pkg/client/informers/internalinterfaces/internal_interfaces.go @@ -19,15 +19,15 @@ limitations under the License. package internalinterfaces import ( + clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" internalclientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset" - release_1_5 "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset" cache "k8s.io/kubernetes/pkg/client/cache" runtime "k8s.io/kubernetes/pkg/runtime" time "time" ) type NewInternalInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer -type NewVersionedInformerFunc func(release_1_5.Interface, time.Duration) cache.SharedIndexInformer +type NewVersionedInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer // SharedInformerFactory a small interface to allow for adding an informer without an import cycle type SharedInformerFactory interface { diff --git a/federation/client/clientset_generated/federation_clientset/BUILD b/federation/client/clientset_generated/federation_clientset/BUILD index 58efa2c28f0..9712698475a 100644 --- a/federation/client/clientset_generated/federation_clientset/BUILD +++ b/federation/client/clientset_generated/federation_clientset/BUILD @@ -17,9 +17,9 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/install:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/core/v1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/util/flowcontrol:go_default_library", diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index ffe87a7bbf0..2e194f8f680 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package federation_release_1_5 +package federation_clientset import ( "github.com/golang/glog" - v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" - v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1" - v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1" + v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" + v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" + v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" diff --git a/federation/client/clientset_generated/federation_clientset/doc.go b/federation/client/clientset_generated/federation_clientset/doc.go index 337eb6992b1..22b714c72b2 100644 --- a/federation/client/clientset_generated/federation_clientset/doc.go +++ b/federation/client/clientset_generated/federation_clientset/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // This package has the automatically generated clientset. -package federation_release_1_5 +package federation_clientset diff --git a/federation/client/clientset_generated/federation_clientset/fake/BUILD b/federation/client/clientset_generated/federation_clientset/fake/BUILD index 7e7263f82c1..f1d91cb7b06 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/fake/BUILD @@ -15,13 +15,13 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/core/v1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/core/v1/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake:go_default_library", "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go index 24b23ebdf3e..7c2858653b4 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go @@ -17,13 +17,13 @@ limitations under the License. package fake import ( - clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" - v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" - fakev1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake" - v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1" - fakev1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake" - v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1" - fakev1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake" + clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" + v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" + fakev1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake" + v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" + fakev1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake" + v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" + fakev1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/federation/client/clientset_generated/federation_clientset/fake/doc.go b/federation/client/clientset_generated/federation_clientset/fake/doc.go index ace6053aeed..44ae2609810 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // This package has the automatically generated fake clientset. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go index 70e08f10fe1..fe08638051a 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD index 70e4391b6af..7f9f919ddf2 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD @@ -21,7 +21,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5/typed/core/v1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go index 739ee29a10f..4d4859af874 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go index 15b74d43afa..a087a64a822 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" + v1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go index 3ac72cc6d3e..2f39497e762 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD index c95d91b40bf..d071223b8d0 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD @@ -20,7 +20,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go index 739ee29a10f..4d4859af874 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go index d3d3e8f0d41..5680711e4e6 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1" + v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go index 3ac72cc6d3e..2f39497e762 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD index 23b653beb46..ca10f008c08 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD @@ -17,7 +17,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go index 739ee29a10f..4d4859af874 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event] --input=[../../federation/apis/federation/v1beta1,api/v1,extensions/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go index 2cf167cdc26..83a225df654 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1" + v1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) diff --git a/federation/cmd/federation-controller-manager/app/BUILD b/federation/cmd/federation-controller-manager/app/BUILD index fab4a89af49..4e60fbf65cb 100644 --- a/federation/cmd/federation-controller-manager/app/BUILD +++ b/federation/cmd/federation-controller-manager/app/BUILD @@ -16,7 +16,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/cmd/federation-controller-manager/app/options:go_default_library", "//federation/pkg/dnsprovider:go_default_library", "//federation/pkg/dnsprovider/providers/aws/route53:go_default_library", diff --git a/federation/pkg/federation-controller/cluster/BUILD b/federation/pkg/federation-controller/cluster/BUILD index 5d9da31b6b7..386e30766fb 100644 --- a/federation/pkg/federation-controller/cluster/BUILD +++ b/federation/pkg/federation-controller/cluster/BUILD @@ -19,7 +19,7 @@ go_library( deps = [ "//federation/apis/federation/v1beta1:go_default_library", "//federation/client/cache:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", @@ -45,7 +45,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", diff --git a/federation/pkg/federation-controller/configmap/BUILD b/federation/pkg/federation-controller/configmap/BUILD index 3f6e0ebcb32..d15a73445dd 100644 --- a/federation/pkg/federation-controller/configmap/BUILD +++ b/federation/pkg/federation-controller/configmap/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", "//pkg/api:go_default_library", @@ -38,7 +38,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", "//pkg/api/v1:go_default_library", diff --git a/federation/pkg/federation-controller/daemonset/BUILD b/federation/pkg/federation-controller/daemonset/BUILD index 3a98f407455..a8c3eba870c 100644 --- a/federation/pkg/federation-controller/daemonset/BUILD +++ b/federation/pkg/federation-controller/daemonset/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", @@ -41,7 +41,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", diff --git a/federation/pkg/federation-controller/deployment/BUILD b/federation/pkg/federation-controller/deployment/BUILD index 302317aa1ff..77ed3781e8c 100644 --- a/federation/pkg/federation-controller/deployment/BUILD +++ b/federation/pkg/federation-controller/deployment/BUILD @@ -15,7 +15,7 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", @@ -45,7 +45,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/v1:go_default_library", diff --git a/federation/pkg/federation-controller/ingress/BUILD b/federation/pkg/federation-controller/ingress/BUILD index c813599b2ad..e925f76e477 100644 --- a/federation/pkg/federation-controller/ingress/BUILD +++ b/federation/pkg/federation-controller/ingress/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", @@ -42,7 +42,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", diff --git a/federation/pkg/federation-controller/namespace/BUILD b/federation/pkg/federation-controller/namespace/BUILD index 56b6a573dfe..6c0e24e2ce5 100644 --- a/federation/pkg/federation-controller/namespace/BUILD +++ b/federation/pkg/federation-controller/namespace/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", @@ -39,7 +39,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", diff --git a/federation/pkg/federation-controller/replicaset/BUILD b/federation/pkg/federation-controller/replicaset/BUILD index ac5e8f8bfe2..4a088d8d75c 100644 --- a/federation/pkg/federation-controller/replicaset/BUILD +++ b/federation/pkg/federation-controller/replicaset/BUILD @@ -15,7 +15,7 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", @@ -45,7 +45,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/v1:go_default_library", diff --git a/federation/pkg/federation-controller/secret/BUILD b/federation/pkg/federation-controller/secret/BUILD index 1c98e610878..e587476726c 100644 --- a/federation/pkg/federation-controller/secret/BUILD +++ b/federation/pkg/federation-controller/secret/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/eventsink:go_default_library", @@ -40,7 +40,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", diff --git a/federation/pkg/federation-controller/service/BUILD b/federation/pkg/federation-controller/service/BUILD index 2c4171ccab1..c941fec5453 100644 --- a/federation/pkg/federation-controller/service/BUILD +++ b/federation/pkg/federation-controller/service/BUILD @@ -22,7 +22,7 @@ go_library( deps = [ "//federation/apis/federation/v1beta1:go_default_library", "//federation/client/cache:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/pkg/dnsprovider:go_default_library", "//federation/pkg/dnsprovider/rrstype:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", diff --git a/federation/pkg/federation-controller/util/BUILD b/federation/pkg/federation-controller/util/BUILD index fed72c66fe7..2188332fe22 100644 --- a/federation/pkg/federation-controller/util/BUILD +++ b/federation/pkg/federation-controller/util/BUILD @@ -26,14 +26,14 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", @@ -61,7 +61,7 @@ go_test( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/federation/pkg/federation-controller/util/eventsink/BUILD b/federation/pkg/federation-controller/util/eventsink/BUILD index 499ae848c9a..9dd9abc0dce 100644 --- a/federation/pkg/federation-controller/util/eventsink/BUILD +++ b/federation/pkg/federation-controller/util/eventsink/BUILD @@ -13,7 +13,7 @@ go_library( srcs = ["eventsink.go"], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/record:go_default_library", @@ -26,7 +26,7 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5/fake:go_default_library", + "//federation/client/clientset_generated/federation_clientset/fake:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go index 7f7cec891f7..14e805daf9e 100644 --- a/pkg/client/clientset_generated/clientset/clientset.go +++ b/pkg/client/clientset_generated/clientset/clientset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package release_1_5 +package clientset import ( "github.com/golang/glog" diff --git a/pkg/client/clientset_generated/clientset/doc.go b/pkg/client/clientset_generated/clientset/doc.go index a8d31893f38..33ef0b4d637 100644 --- a/pkg/client/clientset_generated/clientset/doc.go +++ b/pkg/client/clientset_generated/clientset/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated clientset. -package release_1_5 +package clientset diff --git a/pkg/client/clientset_generated/clientset/fake/doc.go b/pkg/client/clientset_generated/clientset/fake/doc.go index 3e97a8d69f0..e55472284d7 100644 --- a/pkg/client/clientset_generated/clientset/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated fake clientset. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/doc.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/doc.go index c15d0baccf8..f7631fa4e6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/doc.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/doc.go index c15d0baccf8..f7631fa4e6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/doc.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/doc.go index c15d0baccf8..f7631fa4e6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/doc.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/doc.go index ce67c0e5d52..916befbf68b 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/doc.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/doc.go index ce67c0e5d52..916befbf68b 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/doc.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/doc.go index 05887a553d9..3d2fc001033 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v2alpha1 diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/doc.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/doc.go index 4ca4e887ae2..59d5bb205a7 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/doc.go b/pkg/client/clientset_generated/clientset/typed/core/v1/doc.go index ce67c0e5d52..916befbf68b 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/doc.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/doc.go index c15d0baccf8..f7631fa4e6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/doc.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/doc.go index c15d0baccf8..f7631fa4e6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/doc.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/doc.go index 4ca4e887ae2..59d5bb205a7 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/doc.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/doc.go index c15d0baccf8..f7631fa4e6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/doc.go index 87e4dda424d..ab41d136d93 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=clientset --input=[api/v1,apps/v1beta1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1beta1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/informers/informers_generated/BUILD b/pkg/client/informers/informers_generated/BUILD index e54f59e0009..e8cf851ab57 100644 --- a/pkg/client/informers/informers_generated/BUILD +++ b/pkg/client/informers/informers_generated/BUILD @@ -35,8 +35,8 @@ go_library( "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/informers/informers_generated/apps:go_default_library", "//pkg/client/informers/informers_generated/autoscaling:go_default_library", "//pkg/client/informers/informers_generated/batch:go_default_library", diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go index 0dccc65c36e..49aca5873d8 100644 --- a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go +++ b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type statefulSetInformer struct { factory internalinterfaces.SharedInformerFactory } -func newStatefulSetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newStatefulSetInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go index 40604c63425..38a0512107f 100644 --- a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go @@ -22,7 +22,7 @@ import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" autoscaling_v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type horizontalPodAutoscalerInformer struct { factory internalinterfaces.SharedInformerFactory } -func newHorizontalPodAutoscalerInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newHorizontalPodAutoscalerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/batch/v1/job.go b/pkg/client/informers/informers_generated/batch/v1/job.go index d12ad4a8fb7..44da4132e71 100644 --- a/pkg/client/informers/informers_generated/batch/v1/job.go +++ b/pkg/client/informers/informers_generated/batch/v1/job.go @@ -22,7 +22,7 @@ import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/batch/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type jobInformer struct { factory internalinterfaces.SharedInformerFactory } -func newJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newJobInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go index 18a529248a6..331e12ef11c 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go +++ b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type cronJobInformer struct { factory internalinterfaces.SharedInformerFactory } -func newCronJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newCronJobInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go index 94a7b93eb70..617f4a4b075 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go +++ b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type jobInformer struct { factory internalinterfaces.SharedInformerFactory } -func newJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newJobInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go index 6f6766fe6c1..7cd01f70195 100644 --- a/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go +++ b/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" certificates_v1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/certificates/v1alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type certificateSigningRequestInformer struct { factory internalinterfaces.SharedInformerFactory } -func newCertificateSigningRequestInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newCertificateSigningRequestInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/componentstatus.go b/pkg/client/informers/informers_generated/core/v1/componentstatus.go index 4c4ed1ac7f6..ab9cfdda114 100644 --- a/pkg/client/informers/informers_generated/core/v1/componentstatus.go +++ b/pkg/client/informers/informers_generated/core/v1/componentstatus.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type componentStatusInformer struct { factory internalinterfaces.SharedInformerFactory } -func newComponentStatusInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newComponentStatusInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/configmap.go b/pkg/client/informers/informers_generated/core/v1/configmap.go index a5263aeb421..004f1bdd912 100644 --- a/pkg/client/informers/informers_generated/core/v1/configmap.go +++ b/pkg/client/informers/informers_generated/core/v1/configmap.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type configMapInformer struct { factory internalinterfaces.SharedInformerFactory } -func newConfigMapInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newConfigMapInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/endpoints.go b/pkg/client/informers/informers_generated/core/v1/endpoints.go index 0dfdf199b07..36b712a2963 100644 --- a/pkg/client/informers/informers_generated/core/v1/endpoints.go +++ b/pkg/client/informers/informers_generated/core/v1/endpoints.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type endpointsInformer struct { factory internalinterfaces.SharedInformerFactory } -func newEndpointsInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newEndpointsInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/event.go b/pkg/client/informers/informers_generated/core/v1/event.go index 57abc49ebbc..6ba4c64e42f 100644 --- a/pkg/client/informers/informers_generated/core/v1/event.go +++ b/pkg/client/informers/informers_generated/core/v1/event.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type eventInformer struct { factory internalinterfaces.SharedInformerFactory } -func newEventInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newEventInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/limitrange.go b/pkg/client/informers/informers_generated/core/v1/limitrange.go index 5873e0a298e..f17587ba8eb 100644 --- a/pkg/client/informers/informers_generated/core/v1/limitrange.go +++ b/pkg/client/informers/informers_generated/core/v1/limitrange.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type limitRangeInformer struct { factory internalinterfaces.SharedInformerFactory } -func newLimitRangeInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newLimitRangeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/namespace.go b/pkg/client/informers/informers_generated/core/v1/namespace.go index 0a93361773c..f20166689af 100644 --- a/pkg/client/informers/informers_generated/core/v1/namespace.go +++ b/pkg/client/informers/informers_generated/core/v1/namespace.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type namespaceInformer struct { factory internalinterfaces.SharedInformerFactory } -func newNamespaceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newNamespaceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/node.go b/pkg/client/informers/informers_generated/core/v1/node.go index 23978f9f6a4..e19cedf4a34 100644 --- a/pkg/client/informers/informers_generated/core/v1/node.go +++ b/pkg/client/informers/informers_generated/core/v1/node.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type nodeInformer struct { factory internalinterfaces.SharedInformerFactory } -func newNodeInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newNodeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go index ebac0d64b32..5b9603842ec 100644 --- a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go +++ b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type persistentVolumeInformer struct { factory internalinterfaces.SharedInformerFactory } -func newPersistentVolumeInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newPersistentVolumeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go index ebad895349a..3c5e04fc9ac 100644 --- a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go +++ b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type persistentVolumeClaimInformer struct { factory internalinterfaces.SharedInformerFactory } -func newPersistentVolumeClaimInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newPersistentVolumeClaimInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/pod.go b/pkg/client/informers/informers_generated/core/v1/pod.go index b6ea9adeea2..b08b758b04d 100644 --- a/pkg/client/informers/informers_generated/core/v1/pod.go +++ b/pkg/client/informers/informers_generated/core/v1/pod.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type podInformer struct { factory internalinterfaces.SharedInformerFactory } -func newPodInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newPodInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/podtemplate.go b/pkg/client/informers/informers_generated/core/v1/podtemplate.go index 602925bb66a..71789c580b6 100644 --- a/pkg/client/informers/informers_generated/core/v1/podtemplate.go +++ b/pkg/client/informers/informers_generated/core/v1/podtemplate.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type podTemplateInformer struct { factory internalinterfaces.SharedInformerFactory } -func newPodTemplateInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newPodTemplateInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go index 0e723ff5447..d309a7736db 100644 --- a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go +++ b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type replicationControllerInformer struct { factory internalinterfaces.SharedInformerFactory } -func newReplicationControllerInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newReplicationControllerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/resourcequota.go b/pkg/client/informers/informers_generated/core/v1/resourcequota.go index c22c4a5249c..1933b5fa181 100644 --- a/pkg/client/informers/informers_generated/core/v1/resourcequota.go +++ b/pkg/client/informers/informers_generated/core/v1/resourcequota.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type resourceQuotaInformer struct { factory internalinterfaces.SharedInformerFactory } -func newResourceQuotaInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newResourceQuotaInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/secret.go b/pkg/client/informers/informers_generated/core/v1/secret.go index 3c98a1e3dce..1b77a9b9d3d 100644 --- a/pkg/client/informers/informers_generated/core/v1/secret.go +++ b/pkg/client/informers/informers_generated/core/v1/secret.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type secretInformer struct { factory internalinterfaces.SharedInformerFactory } -func newSecretInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newSecretInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/service.go b/pkg/client/informers/informers_generated/core/v1/service.go index 188d591b6f4..5da7178219c 100644 --- a/pkg/client/informers/informers_generated/core/v1/service.go +++ b/pkg/client/informers/informers_generated/core/v1/service.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type serviceInformer struct { factory internalinterfaces.SharedInformerFactory } -func newServiceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newServiceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go index db7937075c7..721dd834a13 100644 --- a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go +++ b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go @@ -21,7 +21,7 @@ package v1 import ( api_v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/core/v1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -40,7 +40,7 @@ type serviceAccountInformer struct { factory internalinterfaces.SharedInformerFactory } -func newServiceAccountInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newServiceAccountInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api_v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go index 8b4fe95b306..c28d06d0e0c 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type daemonSetInformer struct { factory internalinterfaces.SharedInformerFactory } -func newDaemonSetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newDaemonSetInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go index 50bd2ee7c3b..be933b30e2c 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type deploymentInformer struct { factory internalinterfaces.SharedInformerFactory } -func newDeploymentInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newDeploymentInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go index 118e2fd9d28..e4f4c3cbcfe 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type ingressInformer struct { factory internalinterfaces.SharedInformerFactory } -func newIngressInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newIngressInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/job.go b/pkg/client/informers/informers_generated/extensions/v1beta1/job.go index ac55d2bdbd2..ab264452de1 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/job.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/job.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type jobInformer struct { factory internalinterfaces.SharedInformerFactory } -func newJobInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newJobInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go index 18d60714179..e67ebe45cd2 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type podSecurityPolicyInformer struct { factory internalinterfaces.SharedInformerFactory } -func newPodSecurityPolicyInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newPodSecurityPolicyInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go index 596ae17169d..3202d6aa753 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type replicaSetInformer struct { factory internalinterfaces.SharedInformerFactory } -func newReplicaSetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newReplicaSetInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go index 80f5dfe5719..f5ce1ae080b 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type thirdPartyResourceInformer struct { factory internalinterfaces.SharedInformerFactory } -func newThirdPartyResourceInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newThirdPartyResourceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/factory.go b/pkg/client/informers/informers_generated/factory.go index 295c674e5fb..aed4de7755c 100644 --- a/pkg/client/informers/informers_generated/factory.go +++ b/pkg/client/informers/informers_generated/factory.go @@ -20,8 +20,8 @@ package informers_generated import ( cache "k8s.io/kubernetes/pkg/client/cache" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" apps "k8s.io/kubernetes/pkg/client/informers/informers_generated/apps" autoscaling "k8s.io/kubernetes/pkg/client/informers/informers_generated/autoscaling" batch "k8s.io/kubernetes/pkg/client/informers/informers_generated/batch" @@ -40,7 +40,7 @@ import ( type sharedInformerFactory struct { internalClient internalclientset.Interface - versionedClient release_1_5.Interface + versionedClient clientset.Interface lock sync.Mutex defaultResync time.Duration @@ -51,7 +51,7 @@ type sharedInformerFactory struct { } // NewSharedInformerFactory constructs a new instance of sharedInformerFactory -func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient release_1_5.Interface, defaultResync time.Duration) SharedInformerFactory { +func NewSharedInformerFactory(internalClient internalclientset.Interface, versionedClient clientset.Interface, defaultResync time.Duration) SharedInformerFactory { return &sharedInformerFactory{ internalClient: internalClient, versionedClient: versionedClient, diff --git a/pkg/client/informers/informers_generated/internalinterfaces/BUILD b/pkg/client/informers/informers_generated/internalinterfaces/BUILD index 121bde36134..eae96d8fc46 100644 --- a/pkg/client/informers/informers_generated/internalinterfaces/BUILD +++ b/pkg/client/informers/informers_generated/internalinterfaces/BUILD @@ -13,8 +13,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/runtime:go_default_library", ], ) diff --git a/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go b/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go index f3fb91c61fc..eddf8ac26e4 100644 --- a/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go +++ b/pkg/client/informers/informers_generated/internalinterfaces/internal_interfaces.go @@ -20,14 +20,14 @@ package internalinterfaces import ( cache "k8s.io/kubernetes/pkg/client/cache" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" runtime "k8s.io/kubernetes/pkg/runtime" time "time" ) type NewInternalInformerFunc func(internalclientset.Interface, time.Duration) cache.SharedIndexInformer -type NewVersionedInformerFunc func(release_1_5.Interface, time.Duration) cache.SharedIndexInformer +type NewVersionedInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer // SharedInformerFactory a small interface to allow for adding an informer without an import cycle type SharedInformerFactory interface { diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go index 20760b4d9b4..1d38be2a9b5 100644 --- a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/policy/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type podDisruptionBudgetInformer struct { factory internalinterfaces.SharedInformerFactory } -func newPodDisruptionBudgetInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newPodDisruptionBudgetInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go index 5ee06d2cd07..70c8110b329 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type clusterRoleInformer struct { factory internalinterfaces.SharedInformerFactory } -func newClusterRoleInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newClusterRoleInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go index 5a02beb1e7c..8bf06aa7c17 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type clusterRoleBindingInformer struct { factory internalinterfaces.SharedInformerFactory } -func newClusterRoleBindingInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newClusterRoleBindingInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go index 68aa409bd85..e6d8286c690 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type roleInformer struct { factory internalinterfaces.SharedInformerFactory } -func newRoleInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newRoleInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go index bdf2f45854a..741bd71bada 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type roleBindingInformer struct { factory internalinterfaces.SharedInformerFactory } -func newRoleBindingInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newRoleBindingInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go index 29cafc04d04..10cef0f30ce 100644 --- a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go +++ b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/kubernetes/pkg/api/v1" storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" cache "k8s.io/kubernetes/pkg/client/cache" - release_1_5 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1" runtime "k8s.io/kubernetes/pkg/runtime" @@ -41,7 +41,7 @@ type storageClassInformer struct { factory internalinterfaces.SharedInformerFactory } -func newStorageClassInformer(client release_1_5.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func newStorageClassInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { diff --git a/pkg/controller/informers/BUILD b/pkg/controller/informers/BUILD index e6876bcccae..140243235c6 100644 --- a/pkg/controller/informers/BUILD +++ b/pkg/controller/informers/BUILD @@ -29,8 +29,8 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/listers/batch/v1:go_default_library", "//pkg/client/listers/core/internalversion:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/controller/informers/core.go b/pkg/controller/informers/core.go index 418c01f3d33..f4a6d51e6eb 100644 --- a/pkg/controller/informers/core.go +++ b/pkg/controller/informers/core.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" coreinternallisters "k8s.io/kubernetes/pkg/client/listers/core/internalversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/controller/informers/factory.go b/pkg/controller/informers/factory.go index af6ec27dc9d..c13b1909b3e 100644 --- a/pkg/controller/informers/factory.go +++ b/pkg/controller/informers/factory.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index e14faa130ca..b3b165b15a7 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -75,14 +75,14 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/util:go_default_library", + "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", + "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", - "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/client/unversioned:go_default_library", @@ -164,12 +164,12 @@ go_test( "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/storage:go_default_library", + "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", - "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index e739763fcd9..606dc3603aa 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -44,10 +44,10 @@ import ( "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" + versionedclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" - versionedclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index 5391d5e20c6..d03abd38f74 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -35,9 +35,9 @@ import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" + versionedfake "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - versionedfake "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/kubectl/versioned_client.go b/pkg/kubectl/versioned_client.go index c425e8e67cf..705516f53cb 100644 --- a/pkg/kubectl/versioned_client.go +++ b/pkg/kubectl/versioned_client.go @@ -17,10 +17,10 @@ limitations under the License. package kubectl import ( - internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" externalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" extensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" + internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" ) func versionedClientsetForDeployment(internalClient internalclientset.Interface) externalclientset.Interface { diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index c4022e92b70..c84fb88d752 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -21,8 +21,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/record:go_default_library", "//pkg/kubelet:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", diff --git a/pkg/master/BUILD b/pkg/master/BUILD index c92e931c273..3af06dfb377 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -48,8 +48,8 @@ go_library( "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/storage/install:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/genericapiserver/options:go_default_library", "//pkg/healthz:go_default_library", @@ -111,8 +111,8 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/generated/openapi:go_default_library", diff --git a/pkg/master/master.go b/pkg/master/master.go index dac1b0cbd30..90dd647abbc 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -36,8 +36,8 @@ import ( policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" rbacapi "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver/options" "k8s.io/kubernetes/pkg/healthz" diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 7711742bb78..32d6f8b601a 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -109,8 +109,8 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", - "//federation/client/clientset_generated/federation_release_1_5/typed/core/v1:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", + "//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api:go_default_library", "//pkg/api/annotations:go_default_library", @@ -132,10 +132,10 @@ go_library( "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/apis/storage/v1beta1/util:go_default_library", "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/transport:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/test/e2e/autoscaling_utils.go b/test/e2e/autoscaling_utils.go index 19295eb9031..8d8c9b6dea9 100644 --- a/test/e2e/autoscaling_utils.go +++ b/test/e2e/autoscaling_utils.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/e2e/density.go b/test/e2e/density.go index ac89231df6e..1de85280d67 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index a81760b84eb..086876f5680 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -31,9 +31,9 @@ import ( extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index eb3bccfdd6a..342628a7ce0 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -29,7 +29,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_release_1_5:go_default_library", + "//federation/client/clientset_generated/federation_clientset:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", @@ -43,9 +43,9 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/meta/v1/unstructured:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/conditions:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index caabf03d14a..86282972df2 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -35,8 +35,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/fields" diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 18b4012186b..08b8ca6fdb5 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -61,8 +61,8 @@ import ( extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/meta/v1/unstructured" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/conditions" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" diff --git a/test/e2e/load.go b/test/e2e/load.go index 7086a6a809b..d5e4838ecd6 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/transport" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/service.go b/test/e2e/service.go index f0fe29bcf39..f0ad23c8d24 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -34,8 +34,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/service" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/types" diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 45881c06fab..9293ecaa83a 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -35,9 +35,9 @@ go_library( "//pkg/auth/authorizer:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/auth/user:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/controller:go_default_library", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 52e4a8b4bb0..e55506dde2a 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -45,9 +45,9 @@ import ( authauthorizer "k8s.io/kubernetes/pkg/auth/authorizer" authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union" "k8s.io/kubernetes/pkg/auth/user" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/controller" diff --git a/test/integration/master/master_test.go b/test/integration/master/master_test.go index 357695ea170..9b6cc00636d 100644 --- a/test/integration/master/master_test.go +++ b/test/integration/master/master_test.go @@ -40,8 +40,8 @@ import ( "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clienttypedv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/integration" diff --git a/test/integration/quota/quota_test.go b/test/integration/quota/quota_test.go index 421922e0950..afbbcd34dbd 100644 --- a/test/integration/quota/quota_test.go +++ b/test/integration/quota/quota_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/controller" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go index 530729511c2..555846ed8f8 100644 --- a/test/integration/serviceaccount/service_account_test.go +++ b/test/integration/serviceaccount/service_account_test.go @@ -40,8 +40,8 @@ import ( "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/test/utils/BUILD b/test/utils/BUILD index f827d5834d5..52f8f31a458 100644 --- a/test/utils/BUILD +++ b/test/utils/BUILD @@ -28,8 +28,8 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", diff --git a/test/utils/runners.go b/test/utils/runners.go index 4ce1097d2e8..fa43ac4dbb4 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -32,8 +32,8 @@ import ( extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime/schema"