diff --git a/hack/k8s/codegen/update-generated.sh b/hack/k8s/codegen/update-generated.sh index 680de0eee..dc966d3dd 100755 --- a/hack/k8s/codegen/update-generated.sh +++ b/hack/k8s/codegen/update-generated.sh @@ -5,7 +5,7 @@ set -o nounset set -o pipefail DOCKER_REPO_ROOT="/go/src/github.com/coreos/etcd-operator" -IMAGE=${IMAGE:-"gcr.io/coreos-k8s-scale-testing/codegen"} +IMAGE=${IMAGE:-"gcr.io/coreos-k8s-scale-testing/codegen:1.10"} docker run --rm \ -v "$PWD":"$DOCKER_REPO_ROOT" \ diff --git a/pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go b/pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go index ba07c9dfe..305396e7d 100644 --- a/pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go +++ b/pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go @@ -16,129 +16,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was autogenerated by deepcopy-gen. Do not edit it manually! +// Code generated by deepcopy-gen. DO NOT EDIT. package v1beta2 import ( v1 "k8s.io/api/core/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ABSBackupSource).DeepCopyInto(out.(*ABSBackupSource)) - return nil - }, InType: reflect.TypeOf(&ABSBackupSource{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ABSRestoreSource).DeepCopyInto(out.(*ABSRestoreSource)) - return nil - }, InType: reflect.TypeOf(&ABSRestoreSource{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BackupPolicy).DeepCopyInto(out.(*BackupPolicy)) - return nil - }, InType: reflect.TypeOf(&BackupPolicy{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BackupSource).DeepCopyInto(out.(*BackupSource)) - return nil - }, InType: reflect.TypeOf(&BackupSource{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BackupSpec).DeepCopyInto(out.(*BackupSpec)) - return nil - }, InType: reflect.TypeOf(&BackupSpec{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BackupStatus).DeepCopyInto(out.(*BackupStatus)) - return nil - }, InType: reflect.TypeOf(&BackupStatus{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterCondition).DeepCopyInto(out.(*ClusterCondition)) - return nil - }, InType: reflect.TypeOf(&ClusterCondition{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterSpec).DeepCopyInto(out.(*ClusterSpec)) - return nil - }, InType: reflect.TypeOf(&ClusterSpec{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterStatus).DeepCopyInto(out.(*ClusterStatus)) - return nil - }, InType: reflect.TypeOf(&ClusterStatus{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdBackup).DeepCopyInto(out.(*EtcdBackup)) - return nil - }, InType: reflect.TypeOf(&EtcdBackup{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdBackupList).DeepCopyInto(out.(*EtcdBackupList)) - return nil - }, InType: reflect.TypeOf(&EtcdBackupList{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdCluster).DeepCopyInto(out.(*EtcdCluster)) - return nil - }, InType: reflect.TypeOf(&EtcdCluster{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdClusterList).DeepCopyInto(out.(*EtcdClusterList)) - return nil - }, InType: reflect.TypeOf(&EtcdClusterList{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdClusterRef).DeepCopyInto(out.(*EtcdClusterRef)) - return nil - }, InType: reflect.TypeOf(&EtcdClusterRef{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdRestore).DeepCopyInto(out.(*EtcdRestore)) - return nil - }, InType: reflect.TypeOf(&EtcdRestore{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdRestoreList).DeepCopyInto(out.(*EtcdRestoreList)) - return nil - }, InType: reflect.TypeOf(&EtcdRestoreList{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MemberSecret).DeepCopyInto(out.(*MemberSecret)) - return nil - }, InType: reflect.TypeOf(&MemberSecret{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MembersStatus).DeepCopyInto(out.(*MembersStatus)) - return nil - }, InType: reflect.TypeOf(&MembersStatus{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodPolicy).DeepCopyInto(out.(*PodPolicy)) - return nil - }, InType: reflect.TypeOf(&PodPolicy{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RestoreSource).DeepCopyInto(out.(*RestoreSource)) - return nil - }, InType: reflect.TypeOf(&RestoreSource{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RestoreSpec).DeepCopyInto(out.(*RestoreSpec)) - return nil - }, InType: reflect.TypeOf(&RestoreSpec{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RestoreStatus).DeepCopyInto(out.(*RestoreStatus)) - return nil - }, InType: reflect.TypeOf(&RestoreStatus{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*S3BackupSource).DeepCopyInto(out.(*S3BackupSource)) - return nil - }, InType: reflect.TypeOf(&S3BackupSource{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*S3RestoreSource).DeepCopyInto(out.(*S3RestoreSource)) - return nil - }, InType: reflect.TypeOf(&S3RestoreSource{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StaticTLS).DeepCopyInto(out.(*StaticTLS)) - return nil - }, InType: reflect.TypeOf(&StaticTLS{})}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TLSPolicy).DeepCopyInto(out.(*TLSPolicy)) - return nil - }, InType: reflect.TypeOf(&TLSPolicy{})}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ABSBackupSource) DeepCopyInto(out *ABSBackupSource) { *out = *in @@ -364,9 +250,8 @@ func (in *EtcdBackup) DeepCopy() *EtcdBackup { func (in *EtcdBackup) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c - } else { - return nil } + return nil } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -398,9 +283,8 @@ func (in *EtcdBackupList) DeepCopy() *EtcdBackupList { func (in *EtcdBackupList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c - } else { - return nil } + return nil } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -427,9 +311,8 @@ func (in *EtcdCluster) DeepCopy() *EtcdCluster { func (in *EtcdCluster) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c - } else { - return nil } + return nil } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -461,9 +344,8 @@ func (in *EtcdClusterList) DeepCopy() *EtcdClusterList { func (in *EtcdClusterList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c - } else { - return nil } + return nil } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -506,9 +388,8 @@ func (in *EtcdRestore) DeepCopy() *EtcdRestore { func (in *EtcdRestore) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c - } else { - return nil } + return nil } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -540,9 +421,8 @@ func (in *EtcdRestoreList) DeepCopy() *EtcdRestoreList { func (in *EtcdRestoreList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c - } else { - return nil } + return nil } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index d5cae8ffe..f207df8f6 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package versioned import ( diff --git a/pkg/generated/clientset/versioned/doc.go b/pkg/generated/clientset/versioned/doc.go index f44f8ca7d..3ef04b81b 100644 --- a/pkg/generated/clientset/versioned/doc.go +++ b/pkg/generated/clientset/versioned/doc.go @@ -13,5 +13,8 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + // This package has the automatically generated clientset. package versioned diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index c125203fd..5457327c9 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package fake import ( @@ -40,7 +43,15 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { fakePtr := testing.Fake{} fakePtr.AddReactor("*", "*", testing.ObjectReaction(o)) - fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil)) + fakePtr.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { + gvr := action.GetResource() + ns := action.GetNamespace() + watch, err := o.Watch(gvr, ns) + if err != nil { + return false, nil, err + } + return true, watch, nil + }) return &Clientset{fakePtr, &fakediscovery.FakeDiscovery{Fake: &fakePtr}} } diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go index 1650ca3fa..16d5871f5 100644 --- a/pkg/generated/clientset/versioned/fake/doc.go +++ b/pkg/generated/clientset/versioned/fake/doc.go @@ -13,5 +13,8 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + // This package has the automatically generated fake clientset. package fake diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index b95561d19..7ecefdaad 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package fake import ( @@ -37,7 +40,7 @@ func init() { // // import ( // "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kuberentes/scheme" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" // aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" // ) // @@ -48,5 +51,4 @@ func init() { // correctly. func AddToScheme(scheme *runtime.Scheme) { etcdv1beta2.AddToScheme(scheme) - } diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go index 948124c83..d2030dc97 100644 --- a/pkg/generated/clientset/versioned/scheme/doc.go +++ b/pkg/generated/clientset/versioned/scheme/doc.go @@ -13,5 +13,8 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index 774294397..ab9a544a3 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package scheme import ( @@ -37,7 +40,7 @@ func init() { // // import ( // "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kuberentes/scheme" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" // aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" // ) // @@ -48,5 +51,4 @@ func init() { // correctly. func AddToScheme(scheme *runtime.Scheme) { etcdv1beta2.AddToScheme(scheme) - } diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/doc.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/doc.go index b892a07be..db3564b15 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/doc.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/doc.go @@ -13,5 +13,8 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + // This package has the automatically generated typed clients. package v1beta2 diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcd_client.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcd_client.go index c49bc8889..48e9c71b2 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcd_client.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcd_client.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package v1beta2 import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdbackup.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdbackup.go index c3b9e4c88..4267fcf39 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdbackup.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdbackup.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package v1beta2 import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdcluster.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdcluster.go index 946dcb372..3cd3918d6 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdcluster.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdcluster.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package v1beta2 import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdrestore.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdrestore.go index 3e24f87cf..e5dae4b50 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdrestore.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/etcdrestore.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package v1beta2 import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/doc.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/doc.go index bce180f5e..dc4fe85bd 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/doc.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/doc.go @@ -13,5 +13,8 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + // Package fake has the automatically generated clients. package fake diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcd_client.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcd_client.go index 2226e0af1..79f27104d 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcd_client.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcd_client.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package fake import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdbackup.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdbackup.go index 69093ec3a..581158893 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdbackup.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdbackup.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package fake import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdcluster.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdcluster.go index 514e69bf0..e48997cf3 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdcluster.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdcluster.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package fake import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdrestore.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdrestore.go index f9aee1eac..92ac25eeb 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdrestore.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/fake/fake_etcdrestore.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package fake import ( diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/generated_expansion.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/generated_expansion.go index e4cd72f6e..efe619c63 100644 --- a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/generated_expansion.go +++ b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/generated_expansion.go @@ -13,6 +13,9 @@ 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. */ + +// Code generated by client-gen. DO NOT EDIT. + package v1beta2 type EtcdBackupExpansion interface{} diff --git a/pkg/generated/informers/externalversions/etcd/interface.go b/pkg/generated/informers/externalversions/etcd/interface.go index 1b28cfaef..e3c125c54 100644 --- a/pkg/generated/informers/externalversions/etcd/interface.go +++ b/pkg/generated/informers/externalversions/etcd/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package etcd @@ -30,15 +30,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // V1beta2 returns a new v1beta2.Interface. func (g *group) V1beta2() v1beta2.Interface { - return v1beta2.New(g.SharedInformerFactory) + return v1beta2.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/generated/informers/externalversions/etcd/v1beta2/etcdbackup.go b/pkg/generated/informers/externalversions/etcd/v1beta2/etcdbackup.go index 1d25763d2..349b4b6c6 100644 --- a/pkg/generated/informers/externalversions/etcd/v1beta2/etcdbackup.go +++ b/pkg/generated/informers/externalversions/etcd/v1beta2/etcdbackup.go @@ -14,11 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package v1beta2 import ( + time "time" + etcd_v1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2" versioned "github.com/coreos/etcd-operator/pkg/generated/clientset/versioned" internalinterfaces "github.com/coreos/etcd-operator/pkg/generated/informers/externalversions/internalinterfaces" @@ -27,7 +29,6 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - time "time" ) // EtcdBackupInformer provides access to a shared informer and lister for @@ -38,19 +39,34 @@ type EtcdBackupInformer interface { } type etcdBackupInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewEtcdBackupInformer constructs a new informer for EtcdBackup 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 NewEtcdBackupInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredEtcdBackupInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredEtcdBackupInformer constructs a new informer for EtcdBackup 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 NewFilteredEtcdBackupInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.EtcdV1beta2().EtcdBackups(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.EtcdV1beta2().EtcdBackups(namespace).Watch(options) }, }, @@ -60,12 +76,12 @@ func NewEtcdBackupInformer(client versioned.Interface, namespace string, resyncP ) } -func defaultEtcdBackupInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewEtcdBackupInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *etcdBackupInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredEtcdBackupInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *etcdBackupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&etcd_v1beta2.EtcdBackup{}, defaultEtcdBackupInformer) + return f.factory.InformerFor(&etcd_v1beta2.EtcdBackup{}, f.defaultInformer) } func (f *etcdBackupInformer) Lister() v1beta2.EtcdBackupLister { diff --git a/pkg/generated/informers/externalversions/etcd/v1beta2/etcdcluster.go b/pkg/generated/informers/externalversions/etcd/v1beta2/etcdcluster.go index 159c77444..5e9640dd1 100644 --- a/pkg/generated/informers/externalversions/etcd/v1beta2/etcdcluster.go +++ b/pkg/generated/informers/externalversions/etcd/v1beta2/etcdcluster.go @@ -14,11 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package v1beta2 import ( + time "time" + etcd_v1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2" versioned "github.com/coreos/etcd-operator/pkg/generated/clientset/versioned" internalinterfaces "github.com/coreos/etcd-operator/pkg/generated/informers/externalversions/internalinterfaces" @@ -27,7 +29,6 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - time "time" ) // EtcdClusterInformer provides access to a shared informer and lister for @@ -38,19 +39,34 @@ type EtcdClusterInformer interface { } type etcdClusterInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewEtcdClusterInformer constructs a new informer for EtcdCluster 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 NewEtcdClusterInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredEtcdClusterInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredEtcdClusterInformer constructs a new informer for EtcdCluster 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 NewFilteredEtcdClusterInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.EtcdV1beta2().EtcdClusters(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.EtcdV1beta2().EtcdClusters(namespace).Watch(options) }, }, @@ -60,12 +76,12 @@ func NewEtcdClusterInformer(client versioned.Interface, namespace string, resync ) } -func defaultEtcdClusterInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewEtcdClusterInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *etcdClusterInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredEtcdClusterInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *etcdClusterInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&etcd_v1beta2.EtcdCluster{}, defaultEtcdClusterInformer) + return f.factory.InformerFor(&etcd_v1beta2.EtcdCluster{}, f.defaultInformer) } func (f *etcdClusterInformer) Lister() v1beta2.EtcdClusterLister { diff --git a/pkg/generated/informers/externalversions/etcd/v1beta2/etcdrestore.go b/pkg/generated/informers/externalversions/etcd/v1beta2/etcdrestore.go index f5de06bba..570d2180b 100644 --- a/pkg/generated/informers/externalversions/etcd/v1beta2/etcdrestore.go +++ b/pkg/generated/informers/externalversions/etcd/v1beta2/etcdrestore.go @@ -14,11 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package v1beta2 import ( + time "time" + etcd_v1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2" versioned "github.com/coreos/etcd-operator/pkg/generated/clientset/versioned" internalinterfaces "github.com/coreos/etcd-operator/pkg/generated/informers/externalversions/internalinterfaces" @@ -27,7 +29,6 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - time "time" ) // EtcdRestoreInformer provides access to a shared informer and lister for @@ -38,19 +39,34 @@ type EtcdRestoreInformer interface { } type etcdRestoreInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewEtcdRestoreInformer constructs a new informer for EtcdRestore 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 NewEtcdRestoreInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredEtcdRestoreInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredEtcdRestoreInformer constructs a new informer for EtcdRestore 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 NewFilteredEtcdRestoreInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.EtcdV1beta2().EtcdRestores(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.EtcdV1beta2().EtcdRestores(namespace).Watch(options) }, }, @@ -60,12 +76,12 @@ func NewEtcdRestoreInformer(client versioned.Interface, namespace string, resync ) } -func defaultEtcdRestoreInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewEtcdRestoreInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *etcdRestoreInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredEtcdRestoreInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *etcdRestoreInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&etcd_v1beta2.EtcdRestore{}, defaultEtcdRestoreInformer) + return f.factory.InformerFor(&etcd_v1beta2.EtcdRestore{}, f.defaultInformer) } func (f *etcdRestoreInformer) Lister() v1beta2.EtcdRestoreLister { diff --git a/pkg/generated/informers/externalversions/etcd/v1beta2/interface.go b/pkg/generated/informers/externalversions/etcd/v1beta2/interface.go index a0a134f81..b19ca9fd7 100644 --- a/pkg/generated/informers/externalversions/etcd/v1beta2/interface.go +++ b/pkg/generated/informers/externalversions/etcd/v1beta2/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package v1beta2 @@ -33,25 +33,27 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // EtcdBackups returns a EtcdBackupInformer. func (v *version) EtcdBackups() EtcdBackupInformer { - return &etcdBackupInformer{factory: v.SharedInformerFactory} + return &etcdBackupInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // EtcdClusters returns a EtcdClusterInformer. func (v *version) EtcdClusters() EtcdClusterInformer { - return &etcdClusterInformer{factory: v.SharedInformerFactory} + return &etcdClusterInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // EtcdRestores returns a EtcdRestoreInformer. func (v *version) EtcdRestores() EtcdRestoreInformer { - return &etcdRestoreInformer{factory: v.SharedInformerFactory} + return &etcdRestoreInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index 144f44815..b7308e566 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -14,26 +14,30 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package externalversions import ( + reflect "reflect" + sync "sync" + time "time" + versioned "github.com/coreos/etcd-operator/pkg/generated/clientset/versioned" etcd "github.com/coreos/etcd-operator/pkg/generated/informers/externalversions/etcd" internalinterfaces "github.com/coreos/etcd-operator/pkg/generated/informers/externalversions/internalinterfaces" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - reflect "reflect" - sync "sync" - time "time" ) type sharedInformerFactory struct { - client versioned.Interface - lock sync.Mutex - defaultResync time.Duration + client versioned.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -43,8 +47,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -114,5 +127,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Etcd() etcd.Interface { - return etcd.New(f) + return etcd.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index ba51cfcde..712a0079c 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -14,12 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package externalversions import ( "fmt" + v1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -51,7 +52,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Etcd, Version=V1beta2 + // Group=etcd.database.coreos.com, Version=v1beta2 case v1beta2.SchemeGroupVersion.WithResource("etcdbackups"): return &genericInformer{resource: resource.GroupResource(), informer: f.Etcd().V1beta2().EtcdBackups().Informer()}, nil case v1beta2.SchemeGroupVersion.WithResource("etcdclusters"): diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index ba038c418..31b7e8e94 100644 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -14,15 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen +// Code generated by informer-gen. DO NOT EDIT. package internalinterfaces import ( + time "time" + versioned "github.com/coreos/etcd-operator/pkg/generated/clientset/versioned" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - time "time" ) type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer @@ -32,3 +34,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/generated/listers/etcd/v1beta2/etcdbackup.go b/pkg/generated/listers/etcd/v1beta2/etcdbackup.go index e3a8841e5..455ee676d 100644 --- a/pkg/generated/listers/etcd/v1beta2/etcdbackup.go +++ b/pkg/generated/listers/etcd/v1beta2/etcdbackup.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen +// Code generated by lister-gen. DO NOT EDIT. package v1beta2 diff --git a/pkg/generated/listers/etcd/v1beta2/etcdcluster.go b/pkg/generated/listers/etcd/v1beta2/etcdcluster.go index ca408649b..4bd608f0e 100644 --- a/pkg/generated/listers/etcd/v1beta2/etcdcluster.go +++ b/pkg/generated/listers/etcd/v1beta2/etcdcluster.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen +// Code generated by lister-gen. DO NOT EDIT. package v1beta2 diff --git a/pkg/generated/listers/etcd/v1beta2/etcdrestore.go b/pkg/generated/listers/etcd/v1beta2/etcdrestore.go index b19937fcf..7fff4247a 100644 --- a/pkg/generated/listers/etcd/v1beta2/etcdrestore.go +++ b/pkg/generated/listers/etcd/v1beta2/etcdrestore.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen +// Code generated by lister-gen. DO NOT EDIT. package v1beta2 diff --git a/pkg/generated/listers/etcd/v1beta2/expansion_generated.go b/pkg/generated/listers/etcd/v1beta2/expansion_generated.go index 2a8f254b8..6357f3122 100644 --- a/pkg/generated/listers/etcd/v1beta2/expansion_generated.go +++ b/pkg/generated/listers/etcd/v1beta2/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen +// Code generated by lister-gen. DO NOT EDIT. package v1beta2