From 2a2ad4160ca4ee6d7955bd3cd9b5e4c33eb7eef2 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Fri, 3 Nov 2017 13:26:37 +0000 Subject: [PATCH] Regenerate files --- .../certmanager/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/client/clientset/{ => versioned}/clientset.go | 7 +++---- pkg/client/clientset/{ => versioned}/doc.go | 4 ++-- .../{ => versioned}/fake/clientset_generated.go | 15 +++++++-------- pkg/client/clientset/{ => versioned}/fake/doc.go | 2 +- .../clientset/{ => versioned}/fake/register.go | 3 +-- .../clientset/{ => versioned}/scheme/doc.go | 2 +- .../clientset/{ => versioned}/scheme/register.go | 3 +-- .../typed/certmanager/v1alpha1/certificate.go | 5 ++--- .../certmanager/v1alpha1/certmanager_client.go | 5 ++--- .../typed/certmanager/v1alpha1/clusterissuer.go | 5 ++--- .../typed/certmanager/v1alpha1/doc.go | 2 +- .../typed/certmanager/v1alpha1/fake/doc.go | 2 +- .../certmanager/v1alpha1/fake/fake_certificate.go | 3 +-- .../v1alpha1/fake/fake_certmanager_client.go | 5 ++--- .../v1alpha1/fake/fake_clusterissuer.go | 3 +-- .../certmanager/v1alpha1/fake/fake_issuer.go | 3 +-- .../certmanager/v1alpha1/generated_expansion.go | 3 +-- .../typed/certmanager/v1alpha1/issuer.go | 5 ++--- .../certmanager/interface.go | 6 +++--- .../certmanager/v1alpha1/certificate.go | 10 +++++----- .../certmanager/v1alpha1/clusterissuer.go | 10 +++++----- .../certmanager/v1alpha1/interface.go | 4 ++-- .../certmanager/v1alpha1/issuer.go | 10 +++++----- .../informers/{ => externalversions}/factory.go | 14 +++++++------- .../informers/{ => externalversions}/generic.go | 4 ++-- .../internalinterfaces/factory_interfaces.go | 6 +++--- .../listers/certmanager/v1alpha1/certificate.go | 2 +- .../listers/certmanager/v1alpha1/clusterissuer.go | 6 ++---- .../certmanager/v1alpha1/expansion_generated.go | 2 +- pkg/client/listers/certmanager/v1alpha1/issuer.go | 2 +- 31 files changed, 70 insertions(+), 85 deletions(-) rename pkg/client/clientset/{ => versioned}/clientset.go (96%) rename pkg/client/clientset/{ => versioned}/doc.go (92%) rename pkg/client/clientset/{ => versioned}/fake/clientset_generated.go (88%) rename pkg/client/clientset/{ => versioned}/fake/doc.go (94%) rename pkg/client/clientset/{ => versioned}/fake/register.go (97%) rename pkg/client/clientset/{ => versioned}/scheme/doc.go (94%) rename pkg/client/clientset/{ => versioned}/scheme/register.go (97%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/certificate.go (98%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/certmanager_client.go (98%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/clusterissuer.go (98%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/doc.go (94%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/fake/doc.go (94%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/fake/fake_certificate.go (99%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go (94%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go (99%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/fake/fake_issuer.go (99%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/generated_expansion.go (94%) rename pkg/client/clientset/{ => versioned}/typed/certmanager/v1alpha1/issuer.go (98%) rename pkg/client/informers/{ => externalversions}/certmanager/interface.go (89%) rename pkg/client/informers/{ => externalversions}/certmanager/v1alpha1/certificate.go (89%) rename pkg/client/informers/{ => externalversions}/certmanager/v1alpha1/clusterissuer.go (89%) rename pkg/client/informers/{ => externalversions}/certmanager/v1alpha1/interface.go (94%) rename pkg/client/informers/{ => externalversions}/certmanager/v1alpha1/issuer.go (89%) rename pkg/client/informers/{ => externalversions}/factory.go (90%) rename pkg/client/informers/{ => externalversions}/generic.go (97%) rename pkg/client/informers/{ => externalversions}/internalinterfaces/factory_interfaces.go (84%) diff --git a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go index 51fdcebc9..5675c884c 100644 --- a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/clientset.go b/pkg/client/clientset/versioned/clientset.go similarity index 96% rename from pkg/client/clientset/clientset.go rename to pkg/client/clientset/versioned/clientset.go index 66a6ead1f..5a1a8ea48 100644 --- a/pkg/client/clientset/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - -package clientset +package versioned import ( glog "github.com/golang/glog" - certmanagerv1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/typed/certmanager/v1alpha1" + certmanagerv1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/clientset/doc.go b/pkg/client/clientset/versioned/doc.go similarity index 92% rename from pkg/client/clientset/doc.go rename to pkg/client/clientset/versioned/doc.go index 7d72e7fb2..ac83cddf7 100644 --- a/pkg/client/clientset/doc.go +++ b/pkg/client/clientset/versioned/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with custom arguments. // This package has the automatically generated clientset. -package clientset +package versioned diff --git a/pkg/client/clientset/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 88% rename from pkg/client/clientset/fake/clientset_generated.go rename to pkg/client/clientset/versioned/fake/clientset_generated.go index 07e34ddad..66f790677 100644 --- a/pkg/client/clientset/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,13 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package fake import ( - clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset" - certmanagerv1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/typed/certmanager/v1alpha1" - fakecertmanagerv1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/typed/certmanager/v1alpha1/fake" + clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned" + certmanagerv1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1alpha1" + fakecertmanagerv1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -41,10 +40,9 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { fakePtr := testing.Fake{} fakePtr.AddReactor("*", "*", testing.ObjectReaction(o)) - fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) - return &Clientset{fakePtr} + return &Clientset{fakePtr, &fakediscovery.FakeDiscovery{Fake: &fakePtr}} } // Clientset implements clientset.Interface. Meant to be embedded into a @@ -52,10 +50,11 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { // you want to test easier. type Clientset struct { testing.Fake + discovery *fakediscovery.FakeDiscovery } func (c *Clientset) Discovery() discovery.DiscoveryInterface { - return &fakediscovery.FakeDiscovery{Fake: &c.Fake} + return c.discovery } var _ clientset.Interface = &Clientset{} diff --git a/pkg/client/clientset/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go similarity index 94% rename from pkg/client/clientset/fake/doc.go rename to pkg/client/clientset/versioned/fake/doc.go index 5f565b3c8..cd30f9cfa 100644 --- a/pkg/client/clientset/fake/doc.go +++ b/pkg/client/clientset/versioned/fake/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/fake/register.go b/pkg/client/clientset/versioned/fake/register.go similarity index 97% rename from pkg/client/clientset/fake/register.go rename to pkg/client/clientset/versioned/fake/register.go index 719d1c259..1ada3d81c 100644 --- a/pkg/client/clientset/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package fake import ( diff --git a/pkg/client/clientset/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go similarity index 94% rename from pkg/client/clientset/scheme/doc.go rename to pkg/client/clientset/versioned/scheme/doc.go index 5d8ec824f..becbb47fb 100644 --- a/pkg/client/clientset/scheme/doc.go +++ b/pkg/client/clientset/versioned/scheme/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go similarity index 97% rename from pkg/client/clientset/scheme/register.go rename to pkg/client/clientset/versioned/scheme/register.go index d203310f3..4fce3041b 100644 --- a/pkg/client/clientset/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package scheme import ( diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/certificate.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certificate.go similarity index 98% rename from pkg/client/clientset/typed/certmanager/v1alpha1/certificate.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certificate.go index 5d63c0772..4eb74fb86 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/certificate.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certificate.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package v1alpha1 import ( v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - scheme "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/scheme" + scheme "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/certmanager_client.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go similarity index 98% rename from pkg/client/clientset/typed/certmanager/v1alpha1/certmanager_client.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go index 5a4efcf26..20107ab02 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/certmanager_client.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/certmanager_client.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package v1alpha1 import ( v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/scheme" + "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/clusterissuer.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/clusterissuer.go similarity index 98% rename from pkg/client/clientset/typed/certmanager/v1alpha1/clusterissuer.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/clusterissuer.go index e6109164a..33d8cb4e5 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/clusterissuer.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/clusterissuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package v1alpha1 import ( v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - scheme "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/scheme" + scheme "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/doc.go similarity index 94% rename from pkg/client/clientset/typed/certmanager/v1alpha1/doc.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/doc.go index ba8d10d3b..892dd0c3a 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/doc.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/doc.go similarity index 94% rename from pkg/client/clientset/typed/certmanager/v1alpha1/fake/doc.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/doc.go index c6548330a..1136c9415 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/doc.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_certificate.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_certificate.go similarity index 99% rename from pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_certificate.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_certificate.go index d59f9b8cc..18f640931 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_certificate.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_certificate.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package fake import ( diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go similarity index 94% rename from pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go index cbe971bea..3df63cfe7 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_certmanager_client.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,11 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package fake import ( - v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/typed/certmanager/v1alpha1" + v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go similarity index 99% rename from pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go index 2452b160a..0b3aad7a8 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_clusterissuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package fake import ( diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_issuer.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_issuer.go similarity index 99% rename from pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_issuer.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_issuer.go index 752f0b91f..f46ac7c3a 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/fake/fake_issuer.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/fake/fake_issuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package fake import ( diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/generated_expansion.go similarity index 94% rename from pkg/client/clientset/typed/certmanager/v1alpha1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/generated_expansion.go index 8ce122b83..df058e27e 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/generated_expansion.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/generated_expansion.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package v1alpha1 type CertificateExpansion interface{} diff --git a/pkg/client/clientset/typed/certmanager/v1alpha1/issuer.go b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/issuer.go similarity index 98% rename from pkg/client/clientset/typed/certmanager/v1alpha1/issuer.go rename to pkg/client/clientset/versioned/typed/certmanager/v1alpha1/issuer.go index a1c940540..d5247f32b 100644 --- a/pkg/client/clientset/typed/certmanager/v1alpha1/issuer.go +++ b/pkg/client/clientset/versioned/typed/certmanager/v1alpha1/issuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - package v1alpha1 import ( v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - scheme "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/scheme" + scheme "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/certmanager/interface.go b/pkg/client/informers/externalversions/certmanager/interface.go similarity index 89% rename from pkg/client/informers/certmanager/interface.go rename to pkg/client/informers/externalversions/certmanager/interface.go index cf4d31e4d..20bc5096f 100644 --- a/pkg/client/informers/certmanager/interface.go +++ b/pkg/client/informers/externalversions/certmanager/interface.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ limitations under the License. package certmanager import ( - v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/informers/certmanager/v1alpha1" - internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/internalinterfaces" + v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/certmanager/v1alpha1" + internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/certmanager/v1alpha1/certificate.go b/pkg/client/informers/externalversions/certmanager/v1alpha1/certificate.go similarity index 89% rename from pkg/client/informers/certmanager/v1alpha1/certificate.go rename to pkg/client/informers/externalversions/certmanager/v1alpha1/certificate.go index dcf42a820..a3615779f 100644 --- a/pkg/client/informers/certmanager/v1alpha1/certificate.go +++ b/pkg/client/informers/externalversions/certmanager/v1alpha1/certificate.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ package v1alpha1 import ( certmanager_v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset" - internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/internalinterfaces" + versioned "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned" + internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/listers/certmanager/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" @@ -44,7 +44,7 @@ type certificateInformer struct { // NewCertificateInformer constructs a new informer for Certificate type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewCertificateInformer(client clientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { +func NewCertificateInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { @@ -60,7 +60,7 @@ func NewCertificateInformer(client clientset.Interface, namespace string, resync ) } -func defaultCertificateInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func defaultCertificateInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewCertificateInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) } diff --git a/pkg/client/informers/certmanager/v1alpha1/clusterissuer.go b/pkg/client/informers/externalversions/certmanager/v1alpha1/clusterissuer.go similarity index 89% rename from pkg/client/informers/certmanager/v1alpha1/clusterissuer.go rename to pkg/client/informers/externalversions/certmanager/v1alpha1/clusterissuer.go index 00b108370..4677fd70c 100644 --- a/pkg/client/informers/certmanager/v1alpha1/clusterissuer.go +++ b/pkg/client/informers/externalversions/certmanager/v1alpha1/clusterissuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ package v1alpha1 import ( certmanager_v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset" - internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/internalinterfaces" + versioned "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned" + internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/listers/certmanager/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" @@ -44,7 +44,7 @@ type clusterIssuerInformer struct { // NewClusterIssuerInformer constructs a new informer for ClusterIssuer type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewClusterIssuerInformer(client clientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { +func NewClusterIssuerInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { @@ -60,7 +60,7 @@ func NewClusterIssuerInformer(client clientset.Interface, resyncPeriod time.Dura ) } -func defaultClusterIssuerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func defaultClusterIssuerInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewClusterIssuerInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) } diff --git a/pkg/client/informers/certmanager/v1alpha1/interface.go b/pkg/client/informers/externalversions/certmanager/v1alpha1/interface.go similarity index 94% rename from pkg/client/informers/certmanager/v1alpha1/interface.go rename to pkg/client/informers/externalversions/certmanager/v1alpha1/interface.go index cf5e46b92..821dc6df9 100644 --- a/pkg/client/informers/certmanager/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/certmanager/v1alpha1/interface.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/internalinterfaces" + internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/certmanager/v1alpha1/issuer.go b/pkg/client/informers/externalversions/certmanager/v1alpha1/issuer.go similarity index 89% rename from pkg/client/informers/certmanager/v1alpha1/issuer.go rename to pkg/client/informers/externalversions/certmanager/v1alpha1/issuer.go index a72927318..b6b276b93 100644 --- a/pkg/client/informers/certmanager/v1alpha1/issuer.go +++ b/pkg/client/informers/externalversions/certmanager/v1alpha1/issuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ package v1alpha1 import ( certmanager_v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" - clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset" - internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/internalinterfaces" + versioned "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned" + internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/client/listers/certmanager/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" @@ -44,7 +44,7 @@ type issuerInformer struct { // NewIssuerInformer constructs a new informer for Issuer type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewIssuerInformer(client clientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { +func NewIssuerInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { @@ -60,7 +60,7 @@ func NewIssuerInformer(client clientset.Interface, namespace string, resyncPerio ) } -func defaultIssuerInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func defaultIssuerInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewIssuerInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) } diff --git a/pkg/client/informers/factory.go b/pkg/client/informers/externalversions/factory.go similarity index 90% rename from pkg/client/informers/factory.go rename to pkg/client/informers/externalversions/factory.go index 5632ebcf3..1b45514c9 100644 --- a/pkg/client/informers/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ limitations under the License. // This file was automatically generated by informer-gen -package informers +package externalversions import ( - clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset" - certmanager "github.com/jetstack-experimental/cert-manager/pkg/client/informers/certmanager" - internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/internalinterfaces" + versioned "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned" + certmanager "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/certmanager" + internalinterfaces "github.com/jetstack-experimental/cert-manager/pkg/client/informers/externalversions/internalinterfaces" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -31,7 +31,7 @@ import ( ) type sharedInformerFactory struct { - client clientset.Interface + client versioned.Interface lock sync.Mutex defaultResync time.Duration @@ -42,7 +42,7 @@ type sharedInformerFactory struct { } // NewSharedInformerFactory constructs a new instance of sharedInformerFactory -func NewSharedInformerFactory(client clientset.Interface, defaultResync time.Duration) SharedInformerFactory { +func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory { return &sharedInformerFactory{ client: client, defaultResync: defaultResync, diff --git a/pkg/client/informers/generic.go b/pkg/client/informers/externalversions/generic.go similarity index 97% rename from pkg/client/informers/generic.go rename to pkg/client/informers/externalversions/generic.go index a5e23015a..165033508 100644 --- a/pkg/client/informers/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ limitations under the License. // This file was automatically generated by informer-gen -package informers +package externalversions import ( "fmt" diff --git a/pkg/client/informers/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 84% rename from pkg/client/informers/internalinterfaces/factory_interfaces.go rename to pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 750d7e8cc..5f18abaf7 100644 --- a/pkg/client/informers/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ limitations under the License. package internalinterfaces import ( - clientset "github.com/jetstack-experimental/cert-manager/pkg/client/clientset" + versioned "github.com/jetstack-experimental/cert-manager/pkg/client/clientset/versioned" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" ) -type NewInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexInformer +type NewInformerFunc func(versioned.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/listers/certmanager/v1alpha1/certificate.go b/pkg/client/listers/certmanager/v1alpha1/certificate.go index 0f5f88443..61c2853ac 100644 --- a/pkg/client/listers/certmanager/v1alpha1/certificate.go +++ b/pkg/client/listers/certmanager/v1alpha1/certificate.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/listers/certmanager/v1alpha1/clusterissuer.go b/pkg/client/listers/certmanager/v1alpha1/clusterissuer.go index 9e1bc8406..11cd753aa 100644 --- a/pkg/client/listers/certmanager/v1alpha1/clusterissuer.go +++ b/pkg/client/listers/certmanager/v1alpha1/clusterissuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ package v1alpha1 import ( v1alpha1 "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" ) @@ -55,8 +54,7 @@ func (s *clusterIssuerLister) List(selector labels.Selector) (ret []*v1alpha1.Cl // Get retrieves the ClusterIssuer from the index for a given name. func (s *clusterIssuerLister) Get(name string) (*v1alpha1.ClusterIssuer, error) { - key := &v1alpha1.ClusterIssuer{ObjectMeta: v1.ObjectMeta{Name: name}} - obj, exists, err := s.indexer.Get(key) + obj, exists, err := s.indexer.GetByKey(name) if err != nil { return nil, err } diff --git a/pkg/client/listers/certmanager/v1alpha1/expansion_generated.go b/pkg/client/listers/certmanager/v1alpha1/expansion_generated.go index b1b022e60..f05b0f74d 100644 --- a/pkg/client/listers/certmanager/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/certmanager/v1alpha1/expansion_generated.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/listers/certmanager/v1alpha1/issuer.go b/pkg/client/listers/certmanager/v1alpha1/issuer.go index 811d73619..0ce4baab3 100644 --- a/pkg/client/listers/certmanager/v1alpha1/issuer.go +++ b/pkg/client/listers/certmanager/v1alpha1/issuer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2017 Jetstack Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.