From 61eab7dca3034628d76713568388d01f0990e847 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Fri, 22 Feb 2019 09:27:01 -0700 Subject: [PATCH] update generated code using 1.12 generator Signed-off-by: Steve Kriss --- hack/build-image/Dockerfile | 4 +- pkg/apis/ark/v1/zz_generated.deepcopy.go | 96 ++++++------------- pkg/apis/velero/v1/zz_generated.deepcopy.go | 96 ++++++------------- .../clientset/versioned/fake/register.go | 18 ++-- .../clientset/versioned/scheme/register.go | 18 ++-- .../versioned/typed/ark/v1/backup.go | 22 ++--- .../typed/ark/v1/backupstoragelocation.go | 22 ++--- .../typed/ark/v1/deletebackuprequest.go | 22 ++--- .../versioned/typed/ark/v1/downloadrequest.go | 22 ++--- .../typed/ark/v1/fake/fake_backup.go | 44 ++++----- .../ark/v1/fake/fake_backupstoragelocation.go | 44 ++++----- .../ark/v1/fake/fake_deletebackuprequest.go | 44 ++++----- .../typed/ark/v1/fake/fake_downloadrequest.go | 44 ++++----- .../typed/ark/v1/fake/fake_podvolumebackup.go | 44 ++++----- .../ark/v1/fake/fake_podvolumerestore.go | 44 ++++----- .../ark/v1/fake/fake_resticrepository.go | 44 ++++----- .../typed/ark/v1/fake/fake_restore.go | 44 ++++----- .../typed/ark/v1/fake/fake_schedule.go | 44 ++++----- .../ark/v1/fake/fake_serverstatusrequest.go | 44 ++++----- .../v1/fake/fake_volumesnapshotlocation.go | 44 ++++----- .../versioned/typed/ark/v1/podvolumebackup.go | 22 ++--- .../typed/ark/v1/podvolumerestore.go | 22 ++--- .../typed/ark/v1/resticrepository.go | 22 ++--- .../versioned/typed/ark/v1/restore.go | 22 ++--- .../versioned/typed/ark/v1/schedule.go | 22 ++--- .../typed/ark/v1/serverstatusrequest.go | 22 ++--- .../typed/ark/v1/volumesnapshotlocation.go | 22 ++--- .../versioned/typed/velero/v1/backup.go | 22 ++--- .../typed/velero/v1/backupstoragelocation.go | 22 ++--- .../typed/velero/v1/deletebackuprequest.go | 22 ++--- .../typed/velero/v1/downloadrequest.go | 22 ++--- .../typed/velero/v1/fake/fake_backup.go | 44 ++++----- .../v1/fake/fake_backupstoragelocation.go | 44 ++++----- .../v1/fake/fake_deletebackuprequest.go | 44 ++++----- .../velero/v1/fake/fake_downloadrequest.go | 44 ++++----- .../velero/v1/fake/fake_podvolumebackup.go | 44 ++++----- .../velero/v1/fake/fake_podvolumerestore.go | 44 ++++----- .../velero/v1/fake/fake_resticrepository.go | 44 ++++----- .../typed/velero/v1/fake/fake_restore.go | 44 ++++----- .../typed/velero/v1/fake/fake_schedule.go | 44 ++++----- .../v1/fake/fake_serverstatusrequest.go | 44 ++++----- .../v1/fake/fake_volumesnapshotlocation.go | 44 ++++----- .../typed/velero/v1/podvolumebackup.go | 22 ++--- .../typed/velero/v1/podvolumerestore.go | 22 ++--- .../typed/velero/v1/resticrepository.go | 22 ++--- .../versioned/typed/velero/v1/restore.go | 22 ++--- .../versioned/typed/velero/v1/schedule.go | 22 ++--- .../typed/velero/v1/serverstatusrequest.go | 22 ++--- .../typed/velero/v1/volumesnapshotlocation.go | 22 ++--- .../externalversions/ark/v1/backup.go | 12 +-- .../ark/v1/backupstoragelocation.go | 12 +-- .../ark/v1/deletebackuprequest.go | 12 +-- .../ark/v1/downloadrequest.go | 12 +-- .../ark/v1/podvolumebackup.go | 12 +-- .../ark/v1/podvolumerestore.go | 12 +-- .../ark/v1/resticrepository.go | 12 +-- .../externalversions/ark/v1/restore.go | 12 +-- .../externalversions/ark/v1/schedule.go | 12 +-- .../ark/v1/serverstatusrequest.go | 12 +-- .../ark/v1/volumesnapshotlocation.go | 12 +-- .../informers/externalversions/generic.go | 24 ++--- .../externalversions/velero/v1/backup.go | 12 +-- .../velero/v1/backupstoragelocation.go | 12 +-- .../velero/v1/deletebackuprequest.go | 12 +-- .../velero/v1/downloadrequest.go | 12 +-- .../velero/v1/podvolumebackup.go | 12 +-- .../velero/v1/podvolumerestore.go | 12 +-- .../velero/v1/resticrepository.go | 12 +-- .../externalversions/velero/v1/restore.go | 12 +-- .../externalversions/velero/v1/schedule.go | 12 +-- .../velero/v1/serverstatusrequest.go | 12 +-- .../velero/v1/volumesnapshotlocation.go | 12 +-- 72 files changed, 954 insertions(+), 1018 deletions(-) diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 8ddcc33a1..d2a6c9640 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -18,8 +18,8 @@ RUN apk add --update --no-cache git bash && \ mkdir -p /go/src/k8s.io && \ cd /go/src/k8s.io && \ git config --global advice.detachedHead false && \ - git clone -b kubernetes-1.11.0 https://github.com/kubernetes/code-generator && \ - git clone -b kubernetes-1.11.0 https://github.com/kubernetes/apimachinery && \ + git clone -b kubernetes-1.12.0 https://github.com/kubernetes/code-generator && \ + git clone -b kubernetes-1.12.0 https://github.com/kubernetes/apimachinery && \ go get golang.org/x/tools/cmd/goimports && \ cd /go/src/golang.org/x/tools && \ git checkout 40a48ad93fbe707101afb2099b738471f70594ec && \ diff --git a/pkg/apis/ark/v1/zz_generated.deepcopy.go b/pkg/apis/ark/v1/zz_generated.deepcopy.go index 986639209..395041d40 100644 --- a/pkg/apis/ark/v1/zz_generated.deepcopy.go +++ b/pkg/apis/ark/v1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1 import ( - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -114,12 +114,8 @@ func (in *BackupResourceHook) DeepCopyInto(out *BackupResourceHook) { *out = *in if in.Exec != nil { in, out := &in.Exec, &out.Exec - if *in == nil { - *out = nil - } else { - *out = new(ExecHook) - (*in).DeepCopyInto(*out) - } + *out = new(ExecHook) + (*in).DeepCopyInto(*out) } return } @@ -159,12 +155,8 @@ func (in *BackupResourceHookSpec) DeepCopyInto(out *BackupResourceHookSpec) { } if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - if *in == nil { - *out = nil - } else { - *out = new(meta_v1.LabelSelector) - (*in).DeepCopyInto(*out) - } + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) } if in.Hooks != nil { in, out := &in.Hooks, &out.Hooks @@ -225,31 +217,19 @@ func (in *BackupSpec) DeepCopyInto(out *BackupSpec) { } if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - if *in == nil { - *out = nil - } else { - *out = new(meta_v1.LabelSelector) - (*in).DeepCopyInto(*out) - } + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) } if in.SnapshotVolumes != nil { in, out := &in.SnapshotVolumes, &out.SnapshotVolumes - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } out.TTL = in.TTL if in.IncludeClusterResources != nil { in, out := &in.IncludeClusterResources, &out.IncludeClusterResources - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } in.Hooks.DeepCopyInto(&out.Hooks) if in.VolumeSnapshotLocations != nil { @@ -278,12 +258,15 @@ func (in *BackupStatus) DeepCopyInto(out *BackupStatus) { in, out := &in.VolumeBackups, &out.VolumeBackups *out = make(map[string]*VolumeBackupInfo, len(*in)) for key, val := range *in { + var outVal *VolumeBackupInfo if val == nil { (*out)[key] = nil } else { - (*out)[key] = new(VolumeBackupInfo) - val.DeepCopyInto((*out)[key]) + in, out := &val, &outVal + *out = new(VolumeBackupInfo) + (*in).DeepCopyInto(*out) } + (*out)[key] = outVal } } if in.ValidationErrors != nil { @@ -1023,12 +1006,15 @@ func (in *RestoreResult) DeepCopyInto(out *RestoreResult) { in, out := &in.Namespaces, &out.Namespaces *out = make(map[string][]string, len(*in)) for key, val := range *in { + var outVal []string if val == nil { (*out)[key] = nil } else { - (*out)[key] = make([]string, len(val)) - copy((*out)[key], val) + in, out := &val, &outVal + *out = make([]string, len(*in)) + copy(*out, *in) } + (*out)[key] = outVal } } return @@ -1076,30 +1062,18 @@ func (in *RestoreSpec) DeepCopyInto(out *RestoreSpec) { } if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - if *in == nil { - *out = nil - } else { - *out = new(meta_v1.LabelSelector) - (*in).DeepCopyInto(*out) - } + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) } if in.RestorePVs != nil { in, out := &in.RestorePVs, &out.RestorePVs - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } if in.IncludeClusterResources != nil { in, out := &in.IncludeClusterResources, &out.IncludeClusterResources - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } return } @@ -1334,12 +1308,8 @@ func (in *StorageType) DeepCopyInto(out *StorageType) { *out = *in if in.ObjectStorage != nil { in, out := &in.ObjectStorage, &out.ObjectStorage - if *in == nil { - *out = nil - } else { - *out = new(ObjectStorageLocation) - **out = **in - } + *out = new(ObjectStorageLocation) + **out = **in } return } @@ -1359,12 +1329,8 @@ func (in *VolumeBackupInfo) DeepCopyInto(out *VolumeBackupInfo) { *out = *in if in.Iops != nil { in, out := &in.Iops, &out.Iops - if *in == nil { - *out = nil - } else { - *out = new(int64) - **out = **in - } + *out = new(int64) + **out = **in } return } diff --git a/pkg/apis/velero/v1/zz_generated.deepcopy.go b/pkg/apis/velero/v1/zz_generated.deepcopy.go index 1aa4aa8dd..5c78bca2b 100644 --- a/pkg/apis/velero/v1/zz_generated.deepcopy.go +++ b/pkg/apis/velero/v1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1 import ( - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -114,12 +114,8 @@ func (in *BackupResourceHook) DeepCopyInto(out *BackupResourceHook) { *out = *in if in.Exec != nil { in, out := &in.Exec, &out.Exec - if *in == nil { - *out = nil - } else { - *out = new(ExecHook) - (*in).DeepCopyInto(*out) - } + *out = new(ExecHook) + (*in).DeepCopyInto(*out) } return } @@ -159,12 +155,8 @@ func (in *BackupResourceHookSpec) DeepCopyInto(out *BackupResourceHookSpec) { } if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - if *in == nil { - *out = nil - } else { - *out = new(meta_v1.LabelSelector) - (*in).DeepCopyInto(*out) - } + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) } if in.Hooks != nil { in, out := &in.Hooks, &out.Hooks @@ -225,31 +217,19 @@ func (in *BackupSpec) DeepCopyInto(out *BackupSpec) { } if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - if *in == nil { - *out = nil - } else { - *out = new(meta_v1.LabelSelector) - (*in).DeepCopyInto(*out) - } + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) } if in.SnapshotVolumes != nil { in, out := &in.SnapshotVolumes, &out.SnapshotVolumes - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } out.TTL = in.TTL if in.IncludeClusterResources != nil { in, out := &in.IncludeClusterResources, &out.IncludeClusterResources - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } in.Hooks.DeepCopyInto(&out.Hooks) if in.VolumeSnapshotLocations != nil { @@ -278,12 +258,15 @@ func (in *BackupStatus) DeepCopyInto(out *BackupStatus) { in, out := &in.VolumeBackups, &out.VolumeBackups *out = make(map[string]*VolumeBackupInfo, len(*in)) for key, val := range *in { + var outVal *VolumeBackupInfo if val == nil { (*out)[key] = nil } else { - (*out)[key] = new(VolumeBackupInfo) - val.DeepCopyInto((*out)[key]) + in, out := &val, &outVal + *out = new(VolumeBackupInfo) + (*in).DeepCopyInto(*out) } + (*out)[key] = outVal } } if in.ValidationErrors != nil { @@ -1028,12 +1011,15 @@ func (in *RestoreResult) DeepCopyInto(out *RestoreResult) { in, out := &in.Namespaces, &out.Namespaces *out = make(map[string][]string, len(*in)) for key, val := range *in { + var outVal []string if val == nil { (*out)[key] = nil } else { - (*out)[key] = make([]string, len(val)) - copy((*out)[key], val) + in, out := &val, &outVal + *out = make([]string, len(*in)) + copy(*out, *in) } + (*out)[key] = outVal } } return @@ -1081,30 +1067,18 @@ func (in *RestoreSpec) DeepCopyInto(out *RestoreSpec) { } if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - if *in == nil { - *out = nil - } else { - *out = new(meta_v1.LabelSelector) - (*in).DeepCopyInto(*out) - } + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) } if in.RestorePVs != nil { in, out := &in.RestorePVs, &out.RestorePVs - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } if in.IncludeClusterResources != nil { in, out := &in.IncludeClusterResources, &out.IncludeClusterResources - if *in == nil { - *out = nil - } else { - *out = new(bool) - **out = **in - } + *out = new(bool) + **out = **in } return } @@ -1339,12 +1313,8 @@ func (in *StorageType) DeepCopyInto(out *StorageType) { *out = *in if in.ObjectStorage != nil { in, out := &in.ObjectStorage, &out.ObjectStorage - if *in == nil { - *out = nil - } else { - *out = new(ObjectStorageLocation) - **out = **in - } + *out = new(ObjectStorageLocation) + **out = **in } return } @@ -1364,12 +1334,8 @@ func (in *VolumeBackupInfo) DeepCopyInto(out *VolumeBackupInfo) { *out = *in if in.Iops != nil { in, out := &in.Iops, &out.Iops - if *in == nil { - *out = nil - } else { - *out = new(int64) - **out = **in - } + *out = new(int64) + **out = **in } return } diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index ad24eceae..bb7c014c7 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -25,15 +25,15 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + arkv1.AddToScheme, + velerov1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -46,11 +46,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - arkv1.AddToScheme(scheme) - velerov1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(AddToScheme(scheme)) } diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index aa9822392..ff77fd677 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -25,15 +25,15 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + arkv1.AddToScheme, + velerov1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -46,11 +46,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - arkv1.AddToScheme(scheme) - velerov1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(AddToScheme(Scheme)) } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/backup.go b/pkg/generated/clientset/versioned/typed/ark/v1/backup.go index eac0352c3..ffc2d543f 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/backup.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/backup.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type BackupInterface interface { Create(*v1.Backup) (*v1.Backup, error) Update(*v1.Backup) (*v1.Backup, error) UpdateStatus(*v1.Backup) (*v1.Backup, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Backup, error) - List(opts meta_v1.ListOptions) (*v1.BackupList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Backup, error) + List(opts metav1.ListOptions) (*v1.BackupList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Backup, err error) BackupExpansion } @@ -62,7 +62,7 @@ func newBackups(c *ArkV1Client, namespace string) *backups { } // Get takes name of the backup, and returns the corresponding backup object, and an error if there is any. -func (c *backups) Get(name string, options meta_v1.GetOptions) (result *v1.Backup, err error) { +func (c *backups) Get(name string, options metav1.GetOptions) (result *v1.Backup, err error) { result = &v1.Backup{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *backups) Get(name string, options meta_v1.GetOptions) (result *v1.Backu } // List takes label and field selectors, and returns the list of Backups that match those selectors. -func (c *backups) List(opts meta_v1.ListOptions) (result *v1.BackupList, err error) { +func (c *backups) List(opts metav1.ListOptions) (result *v1.BackupList, err error) { result = &v1.BackupList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *backups) List(opts meta_v1.ListOptions) (result *v1.BackupList, err err } // Watch returns a watch.Interface that watches the requested backups. -func (c *backups) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *backups) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *backups) UpdateStatus(backup *v1.Backup) (result *v1.Backup, err error) } // Delete takes name of the backup and deletes it. Returns an error if one occurs. -func (c *backups) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *backups) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backups"). @@ -149,7 +149,7 @@ func (c *backups) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *backups) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *backups) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backups"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/backupstoragelocation.go b/pkg/generated/clientset/versioned/typed/ark/v1/backupstoragelocation.go index f282049d5..86581d0b7 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/backupstoragelocation.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/backupstoragelocation.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type BackupStorageLocationInterface interface { Create(*v1.BackupStorageLocation) (*v1.BackupStorageLocation, error) Update(*v1.BackupStorageLocation) (*v1.BackupStorageLocation, error) UpdateStatus(*v1.BackupStorageLocation) (*v1.BackupStorageLocation, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.BackupStorageLocation, error) - List(opts meta_v1.ListOptions) (*v1.BackupStorageLocationList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.BackupStorageLocation, error) + List(opts metav1.ListOptions) (*v1.BackupStorageLocationList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.BackupStorageLocation, err error) BackupStorageLocationExpansion } @@ -62,7 +62,7 @@ func newBackupStorageLocations(c *ArkV1Client, namespace string) *backupStorageL } // Get takes name of the backupStorageLocation, and returns the corresponding backupStorageLocation object, and an error if there is any. -func (c *backupStorageLocations) Get(name string, options meta_v1.GetOptions) (result *v1.BackupStorageLocation, err error) { +func (c *backupStorageLocations) Get(name string, options metav1.GetOptions) (result *v1.BackupStorageLocation, err error) { result = &v1.BackupStorageLocation{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *backupStorageLocations) Get(name string, options meta_v1.GetOptions) (r } // List takes label and field selectors, and returns the list of BackupStorageLocations that match those selectors. -func (c *backupStorageLocations) List(opts meta_v1.ListOptions) (result *v1.BackupStorageLocationList, err error) { +func (c *backupStorageLocations) List(opts metav1.ListOptions) (result *v1.BackupStorageLocationList, err error) { result = &v1.BackupStorageLocationList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *backupStorageLocations) List(opts meta_v1.ListOptions) (result *v1.Back } // Watch returns a watch.Interface that watches the requested backupStorageLocations. -func (c *backupStorageLocations) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *backupStorageLocations) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *backupStorageLocations) UpdateStatus(backupStorageLocation *v1.BackupSt } // Delete takes name of the backupStorageLocation and deletes it. Returns an error if one occurs. -func (c *backupStorageLocations) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *backupStorageLocations) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backupstoragelocations"). @@ -149,7 +149,7 @@ func (c *backupStorageLocations) Delete(name string, options *meta_v1.DeleteOpti } // DeleteCollection deletes a collection of objects. -func (c *backupStorageLocations) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *backupStorageLocations) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backupstoragelocations"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/deletebackuprequest.go b/pkg/generated/clientset/versioned/typed/ark/v1/deletebackuprequest.go index b743f6bba..3b10c09d4 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/deletebackuprequest.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/deletebackuprequest.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type DeleteBackupRequestInterface interface { Create(*v1.DeleteBackupRequest) (*v1.DeleteBackupRequest, error) Update(*v1.DeleteBackupRequest) (*v1.DeleteBackupRequest, error) UpdateStatus(*v1.DeleteBackupRequest) (*v1.DeleteBackupRequest, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.DeleteBackupRequest, error) - List(opts meta_v1.ListOptions) (*v1.DeleteBackupRequestList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.DeleteBackupRequest, error) + List(opts metav1.ListOptions) (*v1.DeleteBackupRequestList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DeleteBackupRequest, err error) DeleteBackupRequestExpansion } @@ -62,7 +62,7 @@ func newDeleteBackupRequests(c *ArkV1Client, namespace string) *deleteBackupRequ } // Get takes name of the deleteBackupRequest, and returns the corresponding deleteBackupRequest object, and an error if there is any. -func (c *deleteBackupRequests) Get(name string, options meta_v1.GetOptions) (result *v1.DeleteBackupRequest, err error) { +func (c *deleteBackupRequests) Get(name string, options metav1.GetOptions) (result *v1.DeleteBackupRequest, err error) { result = &v1.DeleteBackupRequest{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *deleteBackupRequests) Get(name string, options meta_v1.GetOptions) (res } // List takes label and field selectors, and returns the list of DeleteBackupRequests that match those selectors. -func (c *deleteBackupRequests) List(opts meta_v1.ListOptions) (result *v1.DeleteBackupRequestList, err error) { +func (c *deleteBackupRequests) List(opts metav1.ListOptions) (result *v1.DeleteBackupRequestList, err error) { result = &v1.DeleteBackupRequestList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *deleteBackupRequests) List(opts meta_v1.ListOptions) (result *v1.Delete } // Watch returns a watch.Interface that watches the requested deleteBackupRequests. -func (c *deleteBackupRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *deleteBackupRequests) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *deleteBackupRequests) UpdateStatus(deleteBackupRequest *v1.DeleteBackup } // Delete takes name of the deleteBackupRequest and deletes it. Returns an error if one occurs. -func (c *deleteBackupRequests) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *deleteBackupRequests) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("deletebackuprequests"). @@ -149,7 +149,7 @@ func (c *deleteBackupRequests) Delete(name string, options *meta_v1.DeleteOption } // DeleteCollection deletes a collection of objects. -func (c *deleteBackupRequests) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *deleteBackupRequests) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("deletebackuprequests"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/downloadrequest.go b/pkg/generated/clientset/versioned/typed/ark/v1/downloadrequest.go index e549fac2f..2c1ee6ef5 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/downloadrequest.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/downloadrequest.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type DownloadRequestInterface interface { Create(*v1.DownloadRequest) (*v1.DownloadRequest, error) Update(*v1.DownloadRequest) (*v1.DownloadRequest, error) UpdateStatus(*v1.DownloadRequest) (*v1.DownloadRequest, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.DownloadRequest, error) - List(opts meta_v1.ListOptions) (*v1.DownloadRequestList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.DownloadRequest, error) + List(opts metav1.ListOptions) (*v1.DownloadRequestList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DownloadRequest, err error) DownloadRequestExpansion } @@ -62,7 +62,7 @@ func newDownloadRequests(c *ArkV1Client, namespace string) *downloadRequests { } // Get takes name of the downloadRequest, and returns the corresponding downloadRequest object, and an error if there is any. -func (c *downloadRequests) Get(name string, options meta_v1.GetOptions) (result *v1.DownloadRequest, err error) { +func (c *downloadRequests) Get(name string, options metav1.GetOptions) (result *v1.DownloadRequest, err error) { result = &v1.DownloadRequest{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *downloadRequests) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of DownloadRequests that match those selectors. -func (c *downloadRequests) List(opts meta_v1.ListOptions) (result *v1.DownloadRequestList, err error) { +func (c *downloadRequests) List(opts metav1.ListOptions) (result *v1.DownloadRequestList, err error) { result = &v1.DownloadRequestList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *downloadRequests) List(opts meta_v1.ListOptions) (result *v1.DownloadRe } // Watch returns a watch.Interface that watches the requested downloadRequests. -func (c *downloadRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *downloadRequests) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *downloadRequests) UpdateStatus(downloadRequest *v1.DownloadRequest) (re } // Delete takes name of the downloadRequest and deletes it. Returns an error if one occurs. -func (c *downloadRequests) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *downloadRequests) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("downloadrequests"). @@ -149,7 +149,7 @@ func (c *downloadRequests) Delete(name string, options *meta_v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *downloadRequests) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *downloadRequests) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("downloadrequests"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backup.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backup.go index cba17ac1d..d2304baae 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backup.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backup.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var backupsResource = schema.GroupVersionResource{Group: "ark.heptio.com", Versi var backupsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "Backup"} // Get takes name of the backup, and returns the corresponding backup object, and an error if there is any. -func (c *FakeBackups) Get(name string, options v1.GetOptions) (result *ark_v1.Backup, err error) { +func (c *FakeBackups) Get(name string, options v1.GetOptions) (result *arkv1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(backupsResource, c.ns, name), &ark_v1.Backup{}) + Invokes(testing.NewGetAction(backupsResource, c.ns, name), &arkv1.Backup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Backup), err + return obj.(*arkv1.Backup), err } // List takes label and field selectors, and returns the list of Backups that match those selectors. -func (c *FakeBackups) List(opts v1.ListOptions) (result *ark_v1.BackupList, err error) { +func (c *FakeBackups) List(opts v1.ListOptions) (result *arkv1.BackupList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(backupsResource, backupsKind, c.ns, opts), &ark_v1.BackupList{}) + Invokes(testing.NewListAction(backupsResource, backupsKind, c.ns, opts), &arkv1.BackupList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeBackups) List(opts v1.ListOptions) (result *ark_v1.BackupList, err if label == nil { label = labels.Everything() } - list := &ark_v1.BackupList{ListMeta: obj.(*ark_v1.BackupList).ListMeta} - for _, item := range obj.(*ark_v1.BackupList).Items { + list := &arkv1.BackupList{ListMeta: obj.(*arkv1.BackupList).ListMeta} + for _, item := range obj.(*arkv1.BackupList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeBackups) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a backup and creates it. Returns the server's representation of the backup, and an error, if there is any. -func (c *FakeBackups) Create(backup *ark_v1.Backup) (result *ark_v1.Backup, err error) { +func (c *FakeBackups) Create(backup *arkv1.Backup) (result *arkv1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(backupsResource, c.ns, backup), &ark_v1.Backup{}) + Invokes(testing.NewCreateAction(backupsResource, c.ns, backup), &arkv1.Backup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Backup), err + return obj.(*arkv1.Backup), err } // Update takes the representation of a backup and updates it. Returns the server's representation of the backup, and an error, if there is any. -func (c *FakeBackups) Update(backup *ark_v1.Backup) (result *ark_v1.Backup, err error) { +func (c *FakeBackups) Update(backup *arkv1.Backup) (result *arkv1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(backupsResource, c.ns, backup), &ark_v1.Backup{}) + Invokes(testing.NewUpdateAction(backupsResource, c.ns, backup), &arkv1.Backup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Backup), err + return obj.(*arkv1.Backup), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeBackups) UpdateStatus(backup *ark_v1.Backup) (*ark_v1.Backup, error) { +func (c *FakeBackups) UpdateStatus(backup *arkv1.Backup) (*arkv1.Backup, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(backupsResource, "status", c.ns, backup), &ark_v1.Backup{}) + Invokes(testing.NewUpdateSubresourceAction(backupsResource, "status", c.ns, backup), &arkv1.Backup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Backup), err + return obj.(*arkv1.Backup), err } // Delete takes name of the backup and deletes it. Returns an error if one occurs. func (c *FakeBackups) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(backupsResource, c.ns, name), &ark_v1.Backup{}) + Invokes(testing.NewDeleteAction(backupsResource, c.ns, name), &arkv1.Backup{}) return err } @@ -124,17 +124,17 @@ func (c *FakeBackups) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeBackups) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(backupsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.BackupList{}) + _, err := c.Fake.Invokes(action, &arkv1.BackupList{}) return err } // Patch applies the patch and returns the patched backup. -func (c *FakeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.Backup, err error) { +func (c *FakeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(backupsResource, c.ns, name, data, subresources...), &ark_v1.Backup{}) + Invokes(testing.NewPatchSubresourceAction(backupsResource, c.ns, name, data, subresources...), &arkv1.Backup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Backup), err + return obj.(*arkv1.Backup), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backupstoragelocation.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backupstoragelocation.go index f2b149ff1..c6d21fc26 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backupstoragelocation.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_backupstoragelocation.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var backupstoragelocationsResource = schema.GroupVersionResource{Group: "ark.hep var backupstoragelocationsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "BackupStorageLocation"} // Get takes name of the backupStorageLocation, and returns the corresponding backupStorageLocation object, and an error if there is any. -func (c *FakeBackupStorageLocations) Get(name string, options v1.GetOptions) (result *ark_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Get(name string, options v1.GetOptions) (result *arkv1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(backupstoragelocationsResource, c.ns, name), &ark_v1.BackupStorageLocation{}) + Invokes(testing.NewGetAction(backupstoragelocationsResource, c.ns, name), &arkv1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.BackupStorageLocation), err + return obj.(*arkv1.BackupStorageLocation), err } // List takes label and field selectors, and returns the list of BackupStorageLocations that match those selectors. -func (c *FakeBackupStorageLocations) List(opts v1.ListOptions) (result *ark_v1.BackupStorageLocationList, err error) { +func (c *FakeBackupStorageLocations) List(opts v1.ListOptions) (result *arkv1.BackupStorageLocationList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(backupstoragelocationsResource, backupstoragelocationsKind, c.ns, opts), &ark_v1.BackupStorageLocationList{}) + Invokes(testing.NewListAction(backupstoragelocationsResource, backupstoragelocationsKind, c.ns, opts), &arkv1.BackupStorageLocationList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeBackupStorageLocations) List(opts v1.ListOptions) (result *ark_v1.B if label == nil { label = labels.Everything() } - list := &ark_v1.BackupStorageLocationList{ListMeta: obj.(*ark_v1.BackupStorageLocationList).ListMeta} - for _, item := range obj.(*ark_v1.BackupStorageLocationList).Items { + list := &arkv1.BackupStorageLocationList{ListMeta: obj.(*arkv1.BackupStorageLocationList).ListMeta} + for _, item := range obj.(*arkv1.BackupStorageLocationList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeBackupStorageLocations) Watch(opts v1.ListOptions) (watch.Interface } // Create takes the representation of a backupStorageLocation and creates it. Returns the server's representation of the backupStorageLocation, and an error, if there is any. -func (c *FakeBackupStorageLocations) Create(backupStorageLocation *ark_v1.BackupStorageLocation) (result *ark_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Create(backupStorageLocation *arkv1.BackupStorageLocation) (result *arkv1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &ark_v1.BackupStorageLocation{}) + Invokes(testing.NewCreateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &arkv1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.BackupStorageLocation), err + return obj.(*arkv1.BackupStorageLocation), err } // Update takes the representation of a backupStorageLocation and updates it. Returns the server's representation of the backupStorageLocation, and an error, if there is any. -func (c *FakeBackupStorageLocations) Update(backupStorageLocation *ark_v1.BackupStorageLocation) (result *ark_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Update(backupStorageLocation *arkv1.BackupStorageLocation) (result *arkv1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &ark_v1.BackupStorageLocation{}) + Invokes(testing.NewUpdateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &arkv1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.BackupStorageLocation), err + return obj.(*arkv1.BackupStorageLocation), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeBackupStorageLocations) UpdateStatus(backupStorageLocation *ark_v1.BackupStorageLocation) (*ark_v1.BackupStorageLocation, error) { +func (c *FakeBackupStorageLocations) UpdateStatus(backupStorageLocation *arkv1.BackupStorageLocation) (*arkv1.BackupStorageLocation, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(backupstoragelocationsResource, "status", c.ns, backupStorageLocation), &ark_v1.BackupStorageLocation{}) + Invokes(testing.NewUpdateSubresourceAction(backupstoragelocationsResource, "status", c.ns, backupStorageLocation), &arkv1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.BackupStorageLocation), err + return obj.(*arkv1.BackupStorageLocation), err } // Delete takes name of the backupStorageLocation and deletes it. Returns an error if one occurs. func (c *FakeBackupStorageLocations) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(backupstoragelocationsResource, c.ns, name), &ark_v1.BackupStorageLocation{}) + Invokes(testing.NewDeleteAction(backupstoragelocationsResource, c.ns, name), &arkv1.BackupStorageLocation{}) return err } @@ -124,17 +124,17 @@ func (c *FakeBackupStorageLocations) Delete(name string, options *v1.DeleteOptio func (c *FakeBackupStorageLocations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(backupstoragelocationsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.BackupStorageLocationList{}) + _, err := c.Fake.Invokes(action, &arkv1.BackupStorageLocationList{}) return err } // Patch applies the patch and returns the patched backupStorageLocation. -func (c *FakeBackupStorageLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(backupstoragelocationsResource, c.ns, name, data, subresources...), &ark_v1.BackupStorageLocation{}) + Invokes(testing.NewPatchSubresourceAction(backupstoragelocationsResource, c.ns, name, data, subresources...), &arkv1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.BackupStorageLocation), err + return obj.(*arkv1.BackupStorageLocation), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_deletebackuprequest.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_deletebackuprequest.go index e6cdf958f..37439caba 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_deletebackuprequest.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_deletebackuprequest.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var deletebackuprequestsResource = schema.GroupVersionResource{Group: "ark.hepti var deletebackuprequestsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "DeleteBackupRequest"} // Get takes name of the deleteBackupRequest, and returns the corresponding deleteBackupRequest object, and an error if there is any. -func (c *FakeDeleteBackupRequests) Get(name string, options v1.GetOptions) (result *ark_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Get(name string, options v1.GetOptions) (result *arkv1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(deletebackuprequestsResource, c.ns, name), &ark_v1.DeleteBackupRequest{}) + Invokes(testing.NewGetAction(deletebackuprequestsResource, c.ns, name), &arkv1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DeleteBackupRequest), err + return obj.(*arkv1.DeleteBackupRequest), err } // List takes label and field selectors, and returns the list of DeleteBackupRequests that match those selectors. -func (c *FakeDeleteBackupRequests) List(opts v1.ListOptions) (result *ark_v1.DeleteBackupRequestList, err error) { +func (c *FakeDeleteBackupRequests) List(opts v1.ListOptions) (result *arkv1.DeleteBackupRequestList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(deletebackuprequestsResource, deletebackuprequestsKind, c.ns, opts), &ark_v1.DeleteBackupRequestList{}) + Invokes(testing.NewListAction(deletebackuprequestsResource, deletebackuprequestsKind, c.ns, opts), &arkv1.DeleteBackupRequestList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeDeleteBackupRequests) List(opts v1.ListOptions) (result *ark_v1.Del if label == nil { label = labels.Everything() } - list := &ark_v1.DeleteBackupRequestList{ListMeta: obj.(*ark_v1.DeleteBackupRequestList).ListMeta} - for _, item := range obj.(*ark_v1.DeleteBackupRequestList).Items { + list := &arkv1.DeleteBackupRequestList{ListMeta: obj.(*arkv1.DeleteBackupRequestList).ListMeta} + for _, item := range obj.(*arkv1.DeleteBackupRequestList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeDeleteBackupRequests) Watch(opts v1.ListOptions) (watch.Interface, } // Create takes the representation of a deleteBackupRequest and creates it. Returns the server's representation of the deleteBackupRequest, and an error, if there is any. -func (c *FakeDeleteBackupRequests) Create(deleteBackupRequest *ark_v1.DeleteBackupRequest) (result *ark_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Create(deleteBackupRequest *arkv1.DeleteBackupRequest) (result *arkv1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &ark_v1.DeleteBackupRequest{}) + Invokes(testing.NewCreateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &arkv1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DeleteBackupRequest), err + return obj.(*arkv1.DeleteBackupRequest), err } // Update takes the representation of a deleteBackupRequest and updates it. Returns the server's representation of the deleteBackupRequest, and an error, if there is any. -func (c *FakeDeleteBackupRequests) Update(deleteBackupRequest *ark_v1.DeleteBackupRequest) (result *ark_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Update(deleteBackupRequest *arkv1.DeleteBackupRequest) (result *arkv1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &ark_v1.DeleteBackupRequest{}) + Invokes(testing.NewUpdateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &arkv1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DeleteBackupRequest), err + return obj.(*arkv1.DeleteBackupRequest), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeDeleteBackupRequests) UpdateStatus(deleteBackupRequest *ark_v1.DeleteBackupRequest) (*ark_v1.DeleteBackupRequest, error) { +func (c *FakeDeleteBackupRequests) UpdateStatus(deleteBackupRequest *arkv1.DeleteBackupRequest) (*arkv1.DeleteBackupRequest, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(deletebackuprequestsResource, "status", c.ns, deleteBackupRequest), &ark_v1.DeleteBackupRequest{}) + Invokes(testing.NewUpdateSubresourceAction(deletebackuprequestsResource, "status", c.ns, deleteBackupRequest), &arkv1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DeleteBackupRequest), err + return obj.(*arkv1.DeleteBackupRequest), err } // Delete takes name of the deleteBackupRequest and deletes it. Returns an error if one occurs. func (c *FakeDeleteBackupRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(deletebackuprequestsResource, c.ns, name), &ark_v1.DeleteBackupRequest{}) + Invokes(testing.NewDeleteAction(deletebackuprequestsResource, c.ns, name), &arkv1.DeleteBackupRequest{}) return err } @@ -124,17 +124,17 @@ func (c *FakeDeleteBackupRequests) Delete(name string, options *v1.DeleteOptions func (c *FakeDeleteBackupRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(deletebackuprequestsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.DeleteBackupRequestList{}) + _, err := c.Fake.Invokes(action, &arkv1.DeleteBackupRequestList{}) return err } // Patch applies the patch and returns the patched deleteBackupRequest. -func (c *FakeDeleteBackupRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(deletebackuprequestsResource, c.ns, name, data, subresources...), &ark_v1.DeleteBackupRequest{}) + Invokes(testing.NewPatchSubresourceAction(deletebackuprequestsResource, c.ns, name, data, subresources...), &arkv1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DeleteBackupRequest), err + return obj.(*arkv1.DeleteBackupRequest), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_downloadrequest.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_downloadrequest.go index fa1f9d221..86509a9dc 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_downloadrequest.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_downloadrequest.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var downloadrequestsResource = schema.GroupVersionResource{Group: "ark.heptio.co var downloadrequestsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "DownloadRequest"} // Get takes name of the downloadRequest, and returns the corresponding downloadRequest object, and an error if there is any. -func (c *FakeDownloadRequests) Get(name string, options v1.GetOptions) (result *ark_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Get(name string, options v1.GetOptions) (result *arkv1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(downloadrequestsResource, c.ns, name), &ark_v1.DownloadRequest{}) + Invokes(testing.NewGetAction(downloadrequestsResource, c.ns, name), &arkv1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DownloadRequest), err + return obj.(*arkv1.DownloadRequest), err } // List takes label and field selectors, and returns the list of DownloadRequests that match those selectors. -func (c *FakeDownloadRequests) List(opts v1.ListOptions) (result *ark_v1.DownloadRequestList, err error) { +func (c *FakeDownloadRequests) List(opts v1.ListOptions) (result *arkv1.DownloadRequestList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(downloadrequestsResource, downloadrequestsKind, c.ns, opts), &ark_v1.DownloadRequestList{}) + Invokes(testing.NewListAction(downloadrequestsResource, downloadrequestsKind, c.ns, opts), &arkv1.DownloadRequestList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeDownloadRequests) List(opts v1.ListOptions) (result *ark_v1.Downloa if label == nil { label = labels.Everything() } - list := &ark_v1.DownloadRequestList{ListMeta: obj.(*ark_v1.DownloadRequestList).ListMeta} - for _, item := range obj.(*ark_v1.DownloadRequestList).Items { + list := &arkv1.DownloadRequestList{ListMeta: obj.(*arkv1.DownloadRequestList).ListMeta} + for _, item := range obj.(*arkv1.DownloadRequestList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeDownloadRequests) Watch(opts v1.ListOptions) (watch.Interface, erro } // Create takes the representation of a downloadRequest and creates it. Returns the server's representation of the downloadRequest, and an error, if there is any. -func (c *FakeDownloadRequests) Create(downloadRequest *ark_v1.DownloadRequest) (result *ark_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Create(downloadRequest *arkv1.DownloadRequest) (result *arkv1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(downloadrequestsResource, c.ns, downloadRequest), &ark_v1.DownloadRequest{}) + Invokes(testing.NewCreateAction(downloadrequestsResource, c.ns, downloadRequest), &arkv1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DownloadRequest), err + return obj.(*arkv1.DownloadRequest), err } // Update takes the representation of a downloadRequest and updates it. Returns the server's representation of the downloadRequest, and an error, if there is any. -func (c *FakeDownloadRequests) Update(downloadRequest *ark_v1.DownloadRequest) (result *ark_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Update(downloadRequest *arkv1.DownloadRequest) (result *arkv1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(downloadrequestsResource, c.ns, downloadRequest), &ark_v1.DownloadRequest{}) + Invokes(testing.NewUpdateAction(downloadrequestsResource, c.ns, downloadRequest), &arkv1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DownloadRequest), err + return obj.(*arkv1.DownloadRequest), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeDownloadRequests) UpdateStatus(downloadRequest *ark_v1.DownloadRequest) (*ark_v1.DownloadRequest, error) { +func (c *FakeDownloadRequests) UpdateStatus(downloadRequest *arkv1.DownloadRequest) (*arkv1.DownloadRequest, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(downloadrequestsResource, "status", c.ns, downloadRequest), &ark_v1.DownloadRequest{}) + Invokes(testing.NewUpdateSubresourceAction(downloadrequestsResource, "status", c.ns, downloadRequest), &arkv1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DownloadRequest), err + return obj.(*arkv1.DownloadRequest), err } // Delete takes name of the downloadRequest and deletes it. Returns an error if one occurs. func (c *FakeDownloadRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(downloadrequestsResource, c.ns, name), &ark_v1.DownloadRequest{}) + Invokes(testing.NewDeleteAction(downloadrequestsResource, c.ns, name), &arkv1.DownloadRequest{}) return err } @@ -124,17 +124,17 @@ func (c *FakeDownloadRequests) Delete(name string, options *v1.DeleteOptions) er func (c *FakeDownloadRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(downloadrequestsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.DownloadRequestList{}) + _, err := c.Fake.Invokes(action, &arkv1.DownloadRequestList{}) return err } // Patch applies the patch and returns the patched downloadRequest. -func (c *FakeDownloadRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(downloadrequestsResource, c.ns, name, data, subresources...), &ark_v1.DownloadRequest{}) + Invokes(testing.NewPatchSubresourceAction(downloadrequestsResource, c.ns, name, data, subresources...), &arkv1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.DownloadRequest), err + return obj.(*arkv1.DownloadRequest), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumebackup.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumebackup.go index 34dfb2251..d735a7072 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumebackup.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumebackup.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var podvolumebackupsResource = schema.GroupVersionResource{Group: "ark.heptio.co var podvolumebackupsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "PodVolumeBackup"} // Get takes name of the podVolumeBackup, and returns the corresponding podVolumeBackup object, and an error if there is any. -func (c *FakePodVolumeBackups) Get(name string, options v1.GetOptions) (result *ark_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Get(name string, options v1.GetOptions) (result *arkv1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(podvolumebackupsResource, c.ns, name), &ark_v1.PodVolumeBackup{}) + Invokes(testing.NewGetAction(podvolumebackupsResource, c.ns, name), &arkv1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeBackup), err + return obj.(*arkv1.PodVolumeBackup), err } // List takes label and field selectors, and returns the list of PodVolumeBackups that match those selectors. -func (c *FakePodVolumeBackups) List(opts v1.ListOptions) (result *ark_v1.PodVolumeBackupList, err error) { +func (c *FakePodVolumeBackups) List(opts v1.ListOptions) (result *arkv1.PodVolumeBackupList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(podvolumebackupsResource, podvolumebackupsKind, c.ns, opts), &ark_v1.PodVolumeBackupList{}) + Invokes(testing.NewListAction(podvolumebackupsResource, podvolumebackupsKind, c.ns, opts), &arkv1.PodVolumeBackupList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakePodVolumeBackups) List(opts v1.ListOptions) (result *ark_v1.PodVolu if label == nil { label = labels.Everything() } - list := &ark_v1.PodVolumeBackupList{ListMeta: obj.(*ark_v1.PodVolumeBackupList).ListMeta} - for _, item := range obj.(*ark_v1.PodVolumeBackupList).Items { + list := &arkv1.PodVolumeBackupList{ListMeta: obj.(*arkv1.PodVolumeBackupList).ListMeta} + for _, item := range obj.(*arkv1.PodVolumeBackupList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakePodVolumeBackups) Watch(opts v1.ListOptions) (watch.Interface, erro } // Create takes the representation of a podVolumeBackup and creates it. Returns the server's representation of the podVolumeBackup, and an error, if there is any. -func (c *FakePodVolumeBackups) Create(podVolumeBackup *ark_v1.PodVolumeBackup) (result *ark_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Create(podVolumeBackup *arkv1.PodVolumeBackup) (result *arkv1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &ark_v1.PodVolumeBackup{}) + Invokes(testing.NewCreateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &arkv1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeBackup), err + return obj.(*arkv1.PodVolumeBackup), err } // Update takes the representation of a podVolumeBackup and updates it. Returns the server's representation of the podVolumeBackup, and an error, if there is any. -func (c *FakePodVolumeBackups) Update(podVolumeBackup *ark_v1.PodVolumeBackup) (result *ark_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Update(podVolumeBackup *arkv1.PodVolumeBackup) (result *arkv1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &ark_v1.PodVolumeBackup{}) + Invokes(testing.NewUpdateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &arkv1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeBackup), err + return obj.(*arkv1.PodVolumeBackup), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePodVolumeBackups) UpdateStatus(podVolumeBackup *ark_v1.PodVolumeBackup) (*ark_v1.PodVolumeBackup, error) { +func (c *FakePodVolumeBackups) UpdateStatus(podVolumeBackup *arkv1.PodVolumeBackup) (*arkv1.PodVolumeBackup, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(podvolumebackupsResource, "status", c.ns, podVolumeBackup), &ark_v1.PodVolumeBackup{}) + Invokes(testing.NewUpdateSubresourceAction(podvolumebackupsResource, "status", c.ns, podVolumeBackup), &arkv1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeBackup), err + return obj.(*arkv1.PodVolumeBackup), err } // Delete takes name of the podVolumeBackup and deletes it. Returns an error if one occurs. func (c *FakePodVolumeBackups) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(podvolumebackupsResource, c.ns, name), &ark_v1.PodVolumeBackup{}) + Invokes(testing.NewDeleteAction(podvolumebackupsResource, c.ns, name), &arkv1.PodVolumeBackup{}) return err } @@ -124,17 +124,17 @@ func (c *FakePodVolumeBackups) Delete(name string, options *v1.DeleteOptions) er func (c *FakePodVolumeBackups) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(podvolumebackupsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.PodVolumeBackupList{}) + _, err := c.Fake.Invokes(action, &arkv1.PodVolumeBackupList{}) return err } // Patch applies the patch and returns the patched podVolumeBackup. -func (c *FakePodVolumeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(podvolumebackupsResource, c.ns, name, data, subresources...), &ark_v1.PodVolumeBackup{}) + Invokes(testing.NewPatchSubresourceAction(podvolumebackupsResource, c.ns, name, data, subresources...), &arkv1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeBackup), err + return obj.(*arkv1.PodVolumeBackup), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumerestore.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumerestore.go index 2f2e13717..06f96fec9 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumerestore.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_podvolumerestore.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var podvolumerestoresResource = schema.GroupVersionResource{Group: "ark.heptio.c var podvolumerestoresKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "PodVolumeRestore"} // Get takes name of the podVolumeRestore, and returns the corresponding podVolumeRestore object, and an error if there is any. -func (c *FakePodVolumeRestores) Get(name string, options v1.GetOptions) (result *ark_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Get(name string, options v1.GetOptions) (result *arkv1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(podvolumerestoresResource, c.ns, name), &ark_v1.PodVolumeRestore{}) + Invokes(testing.NewGetAction(podvolumerestoresResource, c.ns, name), &arkv1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeRestore), err + return obj.(*arkv1.PodVolumeRestore), err } // List takes label and field selectors, and returns the list of PodVolumeRestores that match those selectors. -func (c *FakePodVolumeRestores) List(opts v1.ListOptions) (result *ark_v1.PodVolumeRestoreList, err error) { +func (c *FakePodVolumeRestores) List(opts v1.ListOptions) (result *arkv1.PodVolumeRestoreList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(podvolumerestoresResource, podvolumerestoresKind, c.ns, opts), &ark_v1.PodVolumeRestoreList{}) + Invokes(testing.NewListAction(podvolumerestoresResource, podvolumerestoresKind, c.ns, opts), &arkv1.PodVolumeRestoreList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakePodVolumeRestores) List(opts v1.ListOptions) (result *ark_v1.PodVol if label == nil { label = labels.Everything() } - list := &ark_v1.PodVolumeRestoreList{ListMeta: obj.(*ark_v1.PodVolumeRestoreList).ListMeta} - for _, item := range obj.(*ark_v1.PodVolumeRestoreList).Items { + list := &arkv1.PodVolumeRestoreList{ListMeta: obj.(*arkv1.PodVolumeRestoreList).ListMeta} + for _, item := range obj.(*arkv1.PodVolumeRestoreList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakePodVolumeRestores) Watch(opts v1.ListOptions) (watch.Interface, err } // Create takes the representation of a podVolumeRestore and creates it. Returns the server's representation of the podVolumeRestore, and an error, if there is any. -func (c *FakePodVolumeRestores) Create(podVolumeRestore *ark_v1.PodVolumeRestore) (result *ark_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Create(podVolumeRestore *arkv1.PodVolumeRestore) (result *arkv1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &ark_v1.PodVolumeRestore{}) + Invokes(testing.NewCreateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &arkv1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeRestore), err + return obj.(*arkv1.PodVolumeRestore), err } // Update takes the representation of a podVolumeRestore and updates it. Returns the server's representation of the podVolumeRestore, and an error, if there is any. -func (c *FakePodVolumeRestores) Update(podVolumeRestore *ark_v1.PodVolumeRestore) (result *ark_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Update(podVolumeRestore *arkv1.PodVolumeRestore) (result *arkv1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &ark_v1.PodVolumeRestore{}) + Invokes(testing.NewUpdateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &arkv1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeRestore), err + return obj.(*arkv1.PodVolumeRestore), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePodVolumeRestores) UpdateStatus(podVolumeRestore *ark_v1.PodVolumeRestore) (*ark_v1.PodVolumeRestore, error) { +func (c *FakePodVolumeRestores) UpdateStatus(podVolumeRestore *arkv1.PodVolumeRestore) (*arkv1.PodVolumeRestore, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(podvolumerestoresResource, "status", c.ns, podVolumeRestore), &ark_v1.PodVolumeRestore{}) + Invokes(testing.NewUpdateSubresourceAction(podvolumerestoresResource, "status", c.ns, podVolumeRestore), &arkv1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeRestore), err + return obj.(*arkv1.PodVolumeRestore), err } // Delete takes name of the podVolumeRestore and deletes it. Returns an error if one occurs. func (c *FakePodVolumeRestores) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(podvolumerestoresResource, c.ns, name), &ark_v1.PodVolumeRestore{}) + Invokes(testing.NewDeleteAction(podvolumerestoresResource, c.ns, name), &arkv1.PodVolumeRestore{}) return err } @@ -124,17 +124,17 @@ func (c *FakePodVolumeRestores) Delete(name string, options *v1.DeleteOptions) e func (c *FakePodVolumeRestores) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(podvolumerestoresResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.PodVolumeRestoreList{}) + _, err := c.Fake.Invokes(action, &arkv1.PodVolumeRestoreList{}) return err } // Patch applies the patch and returns the patched podVolumeRestore. -func (c *FakePodVolumeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(podvolumerestoresResource, c.ns, name, data, subresources...), &ark_v1.PodVolumeRestore{}) + Invokes(testing.NewPatchSubresourceAction(podvolumerestoresResource, c.ns, name, data, subresources...), &arkv1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.PodVolumeRestore), err + return obj.(*arkv1.PodVolumeRestore), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_resticrepository.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_resticrepository.go index bf34ff634..2e75ef6f4 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_resticrepository.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_resticrepository.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var resticrepositoriesResource = schema.GroupVersionResource{Group: "ark.heptio. var resticrepositoriesKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "ResticRepository"} // Get takes name of the resticRepository, and returns the corresponding resticRepository object, and an error if there is any. -func (c *FakeResticRepositories) Get(name string, options v1.GetOptions) (result *ark_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Get(name string, options v1.GetOptions) (result *arkv1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(resticrepositoriesResource, c.ns, name), &ark_v1.ResticRepository{}) + Invokes(testing.NewGetAction(resticrepositoriesResource, c.ns, name), &arkv1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ResticRepository), err + return obj.(*arkv1.ResticRepository), err } // List takes label and field selectors, and returns the list of ResticRepositories that match those selectors. -func (c *FakeResticRepositories) List(opts v1.ListOptions) (result *ark_v1.ResticRepositoryList, err error) { +func (c *FakeResticRepositories) List(opts v1.ListOptions) (result *arkv1.ResticRepositoryList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(resticrepositoriesResource, resticrepositoriesKind, c.ns, opts), &ark_v1.ResticRepositoryList{}) + Invokes(testing.NewListAction(resticrepositoriesResource, resticrepositoriesKind, c.ns, opts), &arkv1.ResticRepositoryList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeResticRepositories) List(opts v1.ListOptions) (result *ark_v1.Resti if label == nil { label = labels.Everything() } - list := &ark_v1.ResticRepositoryList{ListMeta: obj.(*ark_v1.ResticRepositoryList).ListMeta} - for _, item := range obj.(*ark_v1.ResticRepositoryList).Items { + list := &arkv1.ResticRepositoryList{ListMeta: obj.(*arkv1.ResticRepositoryList).ListMeta} + for _, item := range obj.(*arkv1.ResticRepositoryList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeResticRepositories) Watch(opts v1.ListOptions) (watch.Interface, er } // Create takes the representation of a resticRepository and creates it. Returns the server's representation of the resticRepository, and an error, if there is any. -func (c *FakeResticRepositories) Create(resticRepository *ark_v1.ResticRepository) (result *ark_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Create(resticRepository *arkv1.ResticRepository) (result *arkv1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(resticrepositoriesResource, c.ns, resticRepository), &ark_v1.ResticRepository{}) + Invokes(testing.NewCreateAction(resticrepositoriesResource, c.ns, resticRepository), &arkv1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ResticRepository), err + return obj.(*arkv1.ResticRepository), err } // Update takes the representation of a resticRepository and updates it. Returns the server's representation of the resticRepository, and an error, if there is any. -func (c *FakeResticRepositories) Update(resticRepository *ark_v1.ResticRepository) (result *ark_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Update(resticRepository *arkv1.ResticRepository) (result *arkv1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(resticrepositoriesResource, c.ns, resticRepository), &ark_v1.ResticRepository{}) + Invokes(testing.NewUpdateAction(resticrepositoriesResource, c.ns, resticRepository), &arkv1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ResticRepository), err + return obj.(*arkv1.ResticRepository), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeResticRepositories) UpdateStatus(resticRepository *ark_v1.ResticRepository) (*ark_v1.ResticRepository, error) { +func (c *FakeResticRepositories) UpdateStatus(resticRepository *arkv1.ResticRepository) (*arkv1.ResticRepository, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(resticrepositoriesResource, "status", c.ns, resticRepository), &ark_v1.ResticRepository{}) + Invokes(testing.NewUpdateSubresourceAction(resticrepositoriesResource, "status", c.ns, resticRepository), &arkv1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ResticRepository), err + return obj.(*arkv1.ResticRepository), err } // Delete takes name of the resticRepository and deletes it. Returns an error if one occurs. func (c *FakeResticRepositories) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(resticrepositoriesResource, c.ns, name), &ark_v1.ResticRepository{}) + Invokes(testing.NewDeleteAction(resticrepositoriesResource, c.ns, name), &arkv1.ResticRepository{}) return err } @@ -124,17 +124,17 @@ func (c *FakeResticRepositories) Delete(name string, options *v1.DeleteOptions) func (c *FakeResticRepositories) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(resticrepositoriesResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.ResticRepositoryList{}) + _, err := c.Fake.Invokes(action, &arkv1.ResticRepositoryList{}) return err } // Patch applies the patch and returns the patched resticRepository. -func (c *FakeResticRepositories) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(resticrepositoriesResource, c.ns, name, data, subresources...), &ark_v1.ResticRepository{}) + Invokes(testing.NewPatchSubresourceAction(resticrepositoriesResource, c.ns, name, data, subresources...), &arkv1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ResticRepository), err + return obj.(*arkv1.ResticRepository), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_restore.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_restore.go index a90e30e5d..59ba144b5 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_restore.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_restore.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var restoresResource = schema.GroupVersionResource{Group: "ark.heptio.com", Vers var restoresKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "Restore"} // Get takes name of the restore, and returns the corresponding restore object, and an error if there is any. -func (c *FakeRestores) Get(name string, options v1.GetOptions) (result *ark_v1.Restore, err error) { +func (c *FakeRestores) Get(name string, options v1.GetOptions) (result *arkv1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(restoresResource, c.ns, name), &ark_v1.Restore{}) + Invokes(testing.NewGetAction(restoresResource, c.ns, name), &arkv1.Restore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Restore), err + return obj.(*arkv1.Restore), err } // List takes label and field selectors, and returns the list of Restores that match those selectors. -func (c *FakeRestores) List(opts v1.ListOptions) (result *ark_v1.RestoreList, err error) { +func (c *FakeRestores) List(opts v1.ListOptions) (result *arkv1.RestoreList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(restoresResource, restoresKind, c.ns, opts), &ark_v1.RestoreList{}) + Invokes(testing.NewListAction(restoresResource, restoresKind, c.ns, opts), &arkv1.RestoreList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeRestores) List(opts v1.ListOptions) (result *ark_v1.RestoreList, er if label == nil { label = labels.Everything() } - list := &ark_v1.RestoreList{ListMeta: obj.(*ark_v1.RestoreList).ListMeta} - for _, item := range obj.(*ark_v1.RestoreList).Items { + list := &arkv1.RestoreList{ListMeta: obj.(*arkv1.RestoreList).ListMeta} + for _, item := range obj.(*arkv1.RestoreList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeRestores) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a restore and creates it. Returns the server's representation of the restore, and an error, if there is any. -func (c *FakeRestores) Create(restore *ark_v1.Restore) (result *ark_v1.Restore, err error) { +func (c *FakeRestores) Create(restore *arkv1.Restore) (result *arkv1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(restoresResource, c.ns, restore), &ark_v1.Restore{}) + Invokes(testing.NewCreateAction(restoresResource, c.ns, restore), &arkv1.Restore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Restore), err + return obj.(*arkv1.Restore), err } // Update takes the representation of a restore and updates it. Returns the server's representation of the restore, and an error, if there is any. -func (c *FakeRestores) Update(restore *ark_v1.Restore) (result *ark_v1.Restore, err error) { +func (c *FakeRestores) Update(restore *arkv1.Restore) (result *arkv1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(restoresResource, c.ns, restore), &ark_v1.Restore{}) + Invokes(testing.NewUpdateAction(restoresResource, c.ns, restore), &arkv1.Restore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Restore), err + return obj.(*arkv1.Restore), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeRestores) UpdateStatus(restore *ark_v1.Restore) (*ark_v1.Restore, error) { +func (c *FakeRestores) UpdateStatus(restore *arkv1.Restore) (*arkv1.Restore, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(restoresResource, "status", c.ns, restore), &ark_v1.Restore{}) + Invokes(testing.NewUpdateSubresourceAction(restoresResource, "status", c.ns, restore), &arkv1.Restore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Restore), err + return obj.(*arkv1.Restore), err } // Delete takes name of the restore and deletes it. Returns an error if one occurs. func (c *FakeRestores) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(restoresResource, c.ns, name), &ark_v1.Restore{}) + Invokes(testing.NewDeleteAction(restoresResource, c.ns, name), &arkv1.Restore{}) return err } @@ -124,17 +124,17 @@ func (c *FakeRestores) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeRestores) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(restoresResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.RestoreList{}) + _, err := c.Fake.Invokes(action, &arkv1.RestoreList{}) return err } // Patch applies the patch and returns the patched restore. -func (c *FakeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.Restore, err error) { +func (c *FakeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(restoresResource, c.ns, name, data, subresources...), &ark_v1.Restore{}) + Invokes(testing.NewPatchSubresourceAction(restoresResource, c.ns, name, data, subresources...), &arkv1.Restore{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Restore), err + return obj.(*arkv1.Restore), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_schedule.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_schedule.go index 3f759e666..cd852e902 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_schedule.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_schedule.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var schedulesResource = schema.GroupVersionResource{Group: "ark.heptio.com", Ver var schedulesKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "Schedule"} // Get takes name of the schedule, and returns the corresponding schedule object, and an error if there is any. -func (c *FakeSchedules) Get(name string, options v1.GetOptions) (result *ark_v1.Schedule, err error) { +func (c *FakeSchedules) Get(name string, options v1.GetOptions) (result *arkv1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(schedulesResource, c.ns, name), &ark_v1.Schedule{}) + Invokes(testing.NewGetAction(schedulesResource, c.ns, name), &arkv1.Schedule{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Schedule), err + return obj.(*arkv1.Schedule), err } // List takes label and field selectors, and returns the list of Schedules that match those selectors. -func (c *FakeSchedules) List(opts v1.ListOptions) (result *ark_v1.ScheduleList, err error) { +func (c *FakeSchedules) List(opts v1.ListOptions) (result *arkv1.ScheduleList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(schedulesResource, schedulesKind, c.ns, opts), &ark_v1.ScheduleList{}) + Invokes(testing.NewListAction(schedulesResource, schedulesKind, c.ns, opts), &arkv1.ScheduleList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeSchedules) List(opts v1.ListOptions) (result *ark_v1.ScheduleList, if label == nil { label = labels.Everything() } - list := &ark_v1.ScheduleList{ListMeta: obj.(*ark_v1.ScheduleList).ListMeta} - for _, item := range obj.(*ark_v1.ScheduleList).Items { + list := &arkv1.ScheduleList{ListMeta: obj.(*arkv1.ScheduleList).ListMeta} + for _, item := range obj.(*arkv1.ScheduleList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeSchedules) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a schedule and creates it. Returns the server's representation of the schedule, and an error, if there is any. -func (c *FakeSchedules) Create(schedule *ark_v1.Schedule) (result *ark_v1.Schedule, err error) { +func (c *FakeSchedules) Create(schedule *arkv1.Schedule) (result *arkv1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(schedulesResource, c.ns, schedule), &ark_v1.Schedule{}) + Invokes(testing.NewCreateAction(schedulesResource, c.ns, schedule), &arkv1.Schedule{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Schedule), err + return obj.(*arkv1.Schedule), err } // Update takes the representation of a schedule and updates it. Returns the server's representation of the schedule, and an error, if there is any. -func (c *FakeSchedules) Update(schedule *ark_v1.Schedule) (result *ark_v1.Schedule, err error) { +func (c *FakeSchedules) Update(schedule *arkv1.Schedule) (result *arkv1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(schedulesResource, c.ns, schedule), &ark_v1.Schedule{}) + Invokes(testing.NewUpdateAction(schedulesResource, c.ns, schedule), &arkv1.Schedule{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Schedule), err + return obj.(*arkv1.Schedule), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeSchedules) UpdateStatus(schedule *ark_v1.Schedule) (*ark_v1.Schedule, error) { +func (c *FakeSchedules) UpdateStatus(schedule *arkv1.Schedule) (*arkv1.Schedule, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(schedulesResource, "status", c.ns, schedule), &ark_v1.Schedule{}) + Invokes(testing.NewUpdateSubresourceAction(schedulesResource, "status", c.ns, schedule), &arkv1.Schedule{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Schedule), err + return obj.(*arkv1.Schedule), err } // Delete takes name of the schedule and deletes it. Returns an error if one occurs. func (c *FakeSchedules) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(schedulesResource, c.ns, name), &ark_v1.Schedule{}) + Invokes(testing.NewDeleteAction(schedulesResource, c.ns, name), &arkv1.Schedule{}) return err } @@ -124,17 +124,17 @@ func (c *FakeSchedules) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeSchedules) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(schedulesResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.ScheduleList{}) + _, err := c.Fake.Invokes(action, &arkv1.ScheduleList{}) return err } // Patch applies the patch and returns the patched schedule. -func (c *FakeSchedules) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.Schedule, err error) { +func (c *FakeSchedules) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(schedulesResource, c.ns, name, data, subresources...), &ark_v1.Schedule{}) + Invokes(testing.NewPatchSubresourceAction(schedulesResource, c.ns, name, data, subresources...), &arkv1.Schedule{}) if obj == nil { return nil, err } - return obj.(*ark_v1.Schedule), err + return obj.(*arkv1.Schedule), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_serverstatusrequest.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_serverstatusrequest.go index f5046d972..1a205bdd2 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_serverstatusrequest.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_serverstatusrequest.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var serverstatusrequestsResource = schema.GroupVersionResource{Group: "ark.hepti var serverstatusrequestsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "ServerStatusRequest"} // Get takes name of the serverStatusRequest, and returns the corresponding serverStatusRequest object, and an error if there is any. -func (c *FakeServerStatusRequests) Get(name string, options v1.GetOptions) (result *ark_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Get(name string, options v1.GetOptions) (result *arkv1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(serverstatusrequestsResource, c.ns, name), &ark_v1.ServerStatusRequest{}) + Invokes(testing.NewGetAction(serverstatusrequestsResource, c.ns, name), &arkv1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ServerStatusRequest), err + return obj.(*arkv1.ServerStatusRequest), err } // List takes label and field selectors, and returns the list of ServerStatusRequests that match those selectors. -func (c *FakeServerStatusRequests) List(opts v1.ListOptions) (result *ark_v1.ServerStatusRequestList, err error) { +func (c *FakeServerStatusRequests) List(opts v1.ListOptions) (result *arkv1.ServerStatusRequestList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(serverstatusrequestsResource, serverstatusrequestsKind, c.ns, opts), &ark_v1.ServerStatusRequestList{}) + Invokes(testing.NewListAction(serverstatusrequestsResource, serverstatusrequestsKind, c.ns, opts), &arkv1.ServerStatusRequestList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeServerStatusRequests) List(opts v1.ListOptions) (result *ark_v1.Ser if label == nil { label = labels.Everything() } - list := &ark_v1.ServerStatusRequestList{ListMeta: obj.(*ark_v1.ServerStatusRequestList).ListMeta} - for _, item := range obj.(*ark_v1.ServerStatusRequestList).Items { + list := &arkv1.ServerStatusRequestList{ListMeta: obj.(*arkv1.ServerStatusRequestList).ListMeta} + for _, item := range obj.(*arkv1.ServerStatusRequestList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeServerStatusRequests) Watch(opts v1.ListOptions) (watch.Interface, } // Create takes the representation of a serverStatusRequest and creates it. Returns the server's representation of the serverStatusRequest, and an error, if there is any. -func (c *FakeServerStatusRequests) Create(serverStatusRequest *ark_v1.ServerStatusRequest) (result *ark_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Create(serverStatusRequest *arkv1.ServerStatusRequest) (result *arkv1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &ark_v1.ServerStatusRequest{}) + Invokes(testing.NewCreateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &arkv1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ServerStatusRequest), err + return obj.(*arkv1.ServerStatusRequest), err } // Update takes the representation of a serverStatusRequest and updates it. Returns the server's representation of the serverStatusRequest, and an error, if there is any. -func (c *FakeServerStatusRequests) Update(serverStatusRequest *ark_v1.ServerStatusRequest) (result *ark_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Update(serverStatusRequest *arkv1.ServerStatusRequest) (result *arkv1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &ark_v1.ServerStatusRequest{}) + Invokes(testing.NewUpdateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &arkv1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ServerStatusRequest), err + return obj.(*arkv1.ServerStatusRequest), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeServerStatusRequests) UpdateStatus(serverStatusRequest *ark_v1.ServerStatusRequest) (*ark_v1.ServerStatusRequest, error) { +func (c *FakeServerStatusRequests) UpdateStatus(serverStatusRequest *arkv1.ServerStatusRequest) (*arkv1.ServerStatusRequest, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(serverstatusrequestsResource, "status", c.ns, serverStatusRequest), &ark_v1.ServerStatusRequest{}) + Invokes(testing.NewUpdateSubresourceAction(serverstatusrequestsResource, "status", c.ns, serverStatusRequest), &arkv1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ServerStatusRequest), err + return obj.(*arkv1.ServerStatusRequest), err } // Delete takes name of the serverStatusRequest and deletes it. Returns an error if one occurs. func (c *FakeServerStatusRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(serverstatusrequestsResource, c.ns, name), &ark_v1.ServerStatusRequest{}) + Invokes(testing.NewDeleteAction(serverstatusrequestsResource, c.ns, name), &arkv1.ServerStatusRequest{}) return err } @@ -124,17 +124,17 @@ func (c *FakeServerStatusRequests) Delete(name string, options *v1.DeleteOptions func (c *FakeServerStatusRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(serverstatusrequestsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.ServerStatusRequestList{}) + _, err := c.Fake.Invokes(action, &arkv1.ServerStatusRequestList{}) return err } // Patch applies the patch and returns the patched serverStatusRequest. -func (c *FakeServerStatusRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(serverstatusrequestsResource, c.ns, name, data, subresources...), &ark_v1.ServerStatusRequest{}) + Invokes(testing.NewPatchSubresourceAction(serverstatusrequestsResource, c.ns, name, data, subresources...), &arkv1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*ark_v1.ServerStatusRequest), err + return obj.(*arkv1.ServerStatusRequest), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_volumesnapshotlocation.go b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_volumesnapshotlocation.go index 4f6867d00..dca66b713 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_volumesnapshotlocation.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/fake/fake_volumesnapshotlocation.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var volumesnapshotlocationsResource = schema.GroupVersionResource{Group: "ark.he var volumesnapshotlocationsKind = schema.GroupVersionKind{Group: "ark.heptio.com", Version: "v1", Kind: "VolumeSnapshotLocation"} // Get takes name of the volumeSnapshotLocation, and returns the corresponding volumeSnapshotLocation object, and an error if there is any. -func (c *FakeVolumeSnapshotLocations) Get(name string, options v1.GetOptions) (result *ark_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Get(name string, options v1.GetOptions) (result *arkv1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(volumesnapshotlocationsResource, c.ns, name), &ark_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewGetAction(volumesnapshotlocationsResource, c.ns, name), &arkv1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.VolumeSnapshotLocation), err + return obj.(*arkv1.VolumeSnapshotLocation), err } // List takes label and field selectors, and returns the list of VolumeSnapshotLocations that match those selectors. -func (c *FakeVolumeSnapshotLocations) List(opts v1.ListOptions) (result *ark_v1.VolumeSnapshotLocationList, err error) { +func (c *FakeVolumeSnapshotLocations) List(opts v1.ListOptions) (result *arkv1.VolumeSnapshotLocationList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(volumesnapshotlocationsResource, volumesnapshotlocationsKind, c.ns, opts), &ark_v1.VolumeSnapshotLocationList{}) + Invokes(testing.NewListAction(volumesnapshotlocationsResource, volumesnapshotlocationsKind, c.ns, opts), &arkv1.VolumeSnapshotLocationList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeVolumeSnapshotLocations) List(opts v1.ListOptions) (result *ark_v1. if label == nil { label = labels.Everything() } - list := &ark_v1.VolumeSnapshotLocationList{ListMeta: obj.(*ark_v1.VolumeSnapshotLocationList).ListMeta} - for _, item := range obj.(*ark_v1.VolumeSnapshotLocationList).Items { + list := &arkv1.VolumeSnapshotLocationList{ListMeta: obj.(*arkv1.VolumeSnapshotLocationList).ListMeta} + for _, item := range obj.(*arkv1.VolumeSnapshotLocationList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeVolumeSnapshotLocations) Watch(opts v1.ListOptions) (watch.Interfac } // Create takes the representation of a volumeSnapshotLocation and creates it. Returns the server's representation of the volumeSnapshotLocation, and an error, if there is any. -func (c *FakeVolumeSnapshotLocations) Create(volumeSnapshotLocation *ark_v1.VolumeSnapshotLocation) (result *ark_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Create(volumeSnapshotLocation *arkv1.VolumeSnapshotLocation) (result *arkv1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &ark_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewCreateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &arkv1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.VolumeSnapshotLocation), err + return obj.(*arkv1.VolumeSnapshotLocation), err } // Update takes the representation of a volumeSnapshotLocation and updates it. Returns the server's representation of the volumeSnapshotLocation, and an error, if there is any. -func (c *FakeVolumeSnapshotLocations) Update(volumeSnapshotLocation *ark_v1.VolumeSnapshotLocation) (result *ark_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Update(volumeSnapshotLocation *arkv1.VolumeSnapshotLocation) (result *arkv1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &ark_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewUpdateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &arkv1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.VolumeSnapshotLocation), err + return obj.(*arkv1.VolumeSnapshotLocation), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeVolumeSnapshotLocations) UpdateStatus(volumeSnapshotLocation *ark_v1.VolumeSnapshotLocation) (*ark_v1.VolumeSnapshotLocation, error) { +func (c *FakeVolumeSnapshotLocations) UpdateStatus(volumeSnapshotLocation *arkv1.VolumeSnapshotLocation) (*arkv1.VolumeSnapshotLocation, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(volumesnapshotlocationsResource, "status", c.ns, volumeSnapshotLocation), &ark_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewUpdateSubresourceAction(volumesnapshotlocationsResource, "status", c.ns, volumeSnapshotLocation), &arkv1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.VolumeSnapshotLocation), err + return obj.(*arkv1.VolumeSnapshotLocation), err } // Delete takes name of the volumeSnapshotLocation and deletes it. Returns an error if one occurs. func (c *FakeVolumeSnapshotLocations) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(volumesnapshotlocationsResource, c.ns, name), &ark_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewDeleteAction(volumesnapshotlocationsResource, c.ns, name), &arkv1.VolumeSnapshotLocation{}) return err } @@ -124,17 +124,17 @@ func (c *FakeVolumeSnapshotLocations) Delete(name string, options *v1.DeleteOpti func (c *FakeVolumeSnapshotLocations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(volumesnapshotlocationsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &ark_v1.VolumeSnapshotLocationList{}) + _, err := c.Fake.Invokes(action, &arkv1.VolumeSnapshotLocationList{}) return err } // Patch applies the patch and returns the patched volumeSnapshotLocation. -func (c *FakeVolumeSnapshotLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *ark_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *arkv1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(volumesnapshotlocationsResource, c.ns, name, data, subresources...), &ark_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewPatchSubresourceAction(volumesnapshotlocationsResource, c.ns, name, data, subresources...), &arkv1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*ark_v1.VolumeSnapshotLocation), err + return obj.(*arkv1.VolumeSnapshotLocation), err } diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/podvolumebackup.go b/pkg/generated/clientset/versioned/typed/ark/v1/podvolumebackup.go index 90aa0fd4e..b99d22f08 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/podvolumebackup.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/podvolumebackup.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type PodVolumeBackupInterface interface { Create(*v1.PodVolumeBackup) (*v1.PodVolumeBackup, error) Update(*v1.PodVolumeBackup) (*v1.PodVolumeBackup, error) UpdateStatus(*v1.PodVolumeBackup) (*v1.PodVolumeBackup, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.PodVolumeBackup, error) - List(opts meta_v1.ListOptions) (*v1.PodVolumeBackupList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.PodVolumeBackup, error) + List(opts metav1.ListOptions) (*v1.PodVolumeBackupList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PodVolumeBackup, err error) PodVolumeBackupExpansion } @@ -62,7 +62,7 @@ func newPodVolumeBackups(c *ArkV1Client, namespace string) *podVolumeBackups { } // Get takes name of the podVolumeBackup, and returns the corresponding podVolumeBackup object, and an error if there is any. -func (c *podVolumeBackups) Get(name string, options meta_v1.GetOptions) (result *v1.PodVolumeBackup, err error) { +func (c *podVolumeBackups) Get(name string, options metav1.GetOptions) (result *v1.PodVolumeBackup, err error) { result = &v1.PodVolumeBackup{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *podVolumeBackups) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of PodVolumeBackups that match those selectors. -func (c *podVolumeBackups) List(opts meta_v1.ListOptions) (result *v1.PodVolumeBackupList, err error) { +func (c *podVolumeBackups) List(opts metav1.ListOptions) (result *v1.PodVolumeBackupList, err error) { result = &v1.PodVolumeBackupList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *podVolumeBackups) List(opts meta_v1.ListOptions) (result *v1.PodVolumeB } // Watch returns a watch.Interface that watches the requested podVolumeBackups. -func (c *podVolumeBackups) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *podVolumeBackups) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *podVolumeBackups) UpdateStatus(podVolumeBackup *v1.PodVolumeBackup) (re } // Delete takes name of the podVolumeBackup and deletes it. Returns an error if one occurs. -func (c *podVolumeBackups) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *podVolumeBackups) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumebackups"). @@ -149,7 +149,7 @@ func (c *podVolumeBackups) Delete(name string, options *meta_v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *podVolumeBackups) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *podVolumeBackups) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumebackups"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/podvolumerestore.go b/pkg/generated/clientset/versioned/typed/ark/v1/podvolumerestore.go index 92e1bd789..525d138a1 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/podvolumerestore.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/podvolumerestore.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type PodVolumeRestoreInterface interface { Create(*v1.PodVolumeRestore) (*v1.PodVolumeRestore, error) Update(*v1.PodVolumeRestore) (*v1.PodVolumeRestore, error) UpdateStatus(*v1.PodVolumeRestore) (*v1.PodVolumeRestore, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.PodVolumeRestore, error) - List(opts meta_v1.ListOptions) (*v1.PodVolumeRestoreList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.PodVolumeRestore, error) + List(opts metav1.ListOptions) (*v1.PodVolumeRestoreList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PodVolumeRestore, err error) PodVolumeRestoreExpansion } @@ -62,7 +62,7 @@ func newPodVolumeRestores(c *ArkV1Client, namespace string) *podVolumeRestores { } // Get takes name of the podVolumeRestore, and returns the corresponding podVolumeRestore object, and an error if there is any. -func (c *podVolumeRestores) Get(name string, options meta_v1.GetOptions) (result *v1.PodVolumeRestore, err error) { +func (c *podVolumeRestores) Get(name string, options metav1.GetOptions) (result *v1.PodVolumeRestore, err error) { result = &v1.PodVolumeRestore{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *podVolumeRestores) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of PodVolumeRestores that match those selectors. -func (c *podVolumeRestores) List(opts meta_v1.ListOptions) (result *v1.PodVolumeRestoreList, err error) { +func (c *podVolumeRestores) List(opts metav1.ListOptions) (result *v1.PodVolumeRestoreList, err error) { result = &v1.PodVolumeRestoreList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *podVolumeRestores) List(opts meta_v1.ListOptions) (result *v1.PodVolume } // Watch returns a watch.Interface that watches the requested podVolumeRestores. -func (c *podVolumeRestores) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *podVolumeRestores) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *podVolumeRestores) UpdateStatus(podVolumeRestore *v1.PodVolumeRestore) } // Delete takes name of the podVolumeRestore and deletes it. Returns an error if one occurs. -func (c *podVolumeRestores) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *podVolumeRestores) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumerestores"). @@ -149,7 +149,7 @@ func (c *podVolumeRestores) Delete(name string, options *meta_v1.DeleteOptions) } // DeleteCollection deletes a collection of objects. -func (c *podVolumeRestores) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *podVolumeRestores) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumerestores"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/resticrepository.go b/pkg/generated/clientset/versioned/typed/ark/v1/resticrepository.go index 800b7978a..cca36f52b 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/resticrepository.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/resticrepository.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type ResticRepositoryInterface interface { Create(*v1.ResticRepository) (*v1.ResticRepository, error) Update(*v1.ResticRepository) (*v1.ResticRepository, error) UpdateStatus(*v1.ResticRepository) (*v1.ResticRepository, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.ResticRepository, error) - List(opts meta_v1.ListOptions) (*v1.ResticRepositoryList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.ResticRepository, error) + List(opts metav1.ListOptions) (*v1.ResticRepositoryList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ResticRepository, err error) ResticRepositoryExpansion } @@ -62,7 +62,7 @@ func newResticRepositories(c *ArkV1Client, namespace string) *resticRepositories } // Get takes name of the resticRepository, and returns the corresponding resticRepository object, and an error if there is any. -func (c *resticRepositories) Get(name string, options meta_v1.GetOptions) (result *v1.ResticRepository, err error) { +func (c *resticRepositories) Get(name string, options metav1.GetOptions) (result *v1.ResticRepository, err error) { result = &v1.ResticRepository{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *resticRepositories) Get(name string, options meta_v1.GetOptions) (resul } // List takes label and field selectors, and returns the list of ResticRepositories that match those selectors. -func (c *resticRepositories) List(opts meta_v1.ListOptions) (result *v1.ResticRepositoryList, err error) { +func (c *resticRepositories) List(opts metav1.ListOptions) (result *v1.ResticRepositoryList, err error) { result = &v1.ResticRepositoryList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *resticRepositories) List(opts meta_v1.ListOptions) (result *v1.ResticRe } // Watch returns a watch.Interface that watches the requested resticRepositories. -func (c *resticRepositories) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *resticRepositories) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *resticRepositories) UpdateStatus(resticRepository *v1.ResticRepository) } // Delete takes name of the resticRepository and deletes it. Returns an error if one occurs. -func (c *resticRepositories) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *resticRepositories) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("resticrepositories"). @@ -149,7 +149,7 @@ func (c *resticRepositories) Delete(name string, options *meta_v1.DeleteOptions) } // DeleteCollection deletes a collection of objects. -func (c *resticRepositories) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *resticRepositories) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("resticrepositories"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/restore.go b/pkg/generated/clientset/versioned/typed/ark/v1/restore.go index 8b158ef26..dd4853c51 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/restore.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/restore.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type RestoreInterface interface { Create(*v1.Restore) (*v1.Restore, error) Update(*v1.Restore) (*v1.Restore, error) UpdateStatus(*v1.Restore) (*v1.Restore, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Restore, error) - List(opts meta_v1.ListOptions) (*v1.RestoreList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Restore, error) + List(opts metav1.ListOptions) (*v1.RestoreList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Restore, err error) RestoreExpansion } @@ -62,7 +62,7 @@ func newRestores(c *ArkV1Client, namespace string) *restores { } // Get takes name of the restore, and returns the corresponding restore object, and an error if there is any. -func (c *restores) Get(name string, options meta_v1.GetOptions) (result *v1.Restore, err error) { +func (c *restores) Get(name string, options metav1.GetOptions) (result *v1.Restore, err error) { result = &v1.Restore{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *restores) Get(name string, options meta_v1.GetOptions) (result *v1.Rest } // List takes label and field selectors, and returns the list of Restores that match those selectors. -func (c *restores) List(opts meta_v1.ListOptions) (result *v1.RestoreList, err error) { +func (c *restores) List(opts metav1.ListOptions) (result *v1.RestoreList, err error) { result = &v1.RestoreList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *restores) List(opts meta_v1.ListOptions) (result *v1.RestoreList, err e } // Watch returns a watch.Interface that watches the requested restores. -func (c *restores) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *restores) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *restores) UpdateStatus(restore *v1.Restore) (result *v1.Restore, err er } // Delete takes name of the restore and deletes it. Returns an error if one occurs. -func (c *restores) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *restores) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("restores"). @@ -149,7 +149,7 @@ func (c *restores) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *restores) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *restores) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("restores"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/schedule.go b/pkg/generated/clientset/versioned/typed/ark/v1/schedule.go index 35f462c3f..0f29d5b03 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/schedule.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/schedule.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type ScheduleInterface interface { Create(*v1.Schedule) (*v1.Schedule, error) Update(*v1.Schedule) (*v1.Schedule, error) UpdateStatus(*v1.Schedule) (*v1.Schedule, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Schedule, error) - List(opts meta_v1.ListOptions) (*v1.ScheduleList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Schedule, error) + List(opts metav1.ListOptions) (*v1.ScheduleList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Schedule, err error) ScheduleExpansion } @@ -62,7 +62,7 @@ func newSchedules(c *ArkV1Client, namespace string) *schedules { } // Get takes name of the schedule, and returns the corresponding schedule object, and an error if there is any. -func (c *schedules) Get(name string, options meta_v1.GetOptions) (result *v1.Schedule, err error) { +func (c *schedules) Get(name string, options metav1.GetOptions) (result *v1.Schedule, err error) { result = &v1.Schedule{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *schedules) Get(name string, options meta_v1.GetOptions) (result *v1.Sch } // List takes label and field selectors, and returns the list of Schedules that match those selectors. -func (c *schedules) List(opts meta_v1.ListOptions) (result *v1.ScheduleList, err error) { +func (c *schedules) List(opts metav1.ListOptions) (result *v1.ScheduleList, err error) { result = &v1.ScheduleList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *schedules) List(opts meta_v1.ListOptions) (result *v1.ScheduleList, err } // Watch returns a watch.Interface that watches the requested schedules. -func (c *schedules) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *schedules) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *schedules) UpdateStatus(schedule *v1.Schedule) (result *v1.Schedule, er } // Delete takes name of the schedule and deletes it. Returns an error if one occurs. -func (c *schedules) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *schedules) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("schedules"). @@ -149,7 +149,7 @@ func (c *schedules) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *schedules) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *schedules) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("schedules"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/serverstatusrequest.go b/pkg/generated/clientset/versioned/typed/ark/v1/serverstatusrequest.go index 1a6d9ae8f..6d943c74b 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/serverstatusrequest.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/serverstatusrequest.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type ServerStatusRequestInterface interface { Create(*v1.ServerStatusRequest) (*v1.ServerStatusRequest, error) Update(*v1.ServerStatusRequest) (*v1.ServerStatusRequest, error) UpdateStatus(*v1.ServerStatusRequest) (*v1.ServerStatusRequest, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.ServerStatusRequest, error) - List(opts meta_v1.ListOptions) (*v1.ServerStatusRequestList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.ServerStatusRequest, error) + List(opts metav1.ListOptions) (*v1.ServerStatusRequestList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ServerStatusRequest, err error) ServerStatusRequestExpansion } @@ -62,7 +62,7 @@ func newServerStatusRequests(c *ArkV1Client, namespace string) *serverStatusRequ } // Get takes name of the serverStatusRequest, and returns the corresponding serverStatusRequest object, and an error if there is any. -func (c *serverStatusRequests) Get(name string, options meta_v1.GetOptions) (result *v1.ServerStatusRequest, err error) { +func (c *serverStatusRequests) Get(name string, options metav1.GetOptions) (result *v1.ServerStatusRequest, err error) { result = &v1.ServerStatusRequest{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *serverStatusRequests) Get(name string, options meta_v1.GetOptions) (res } // List takes label and field selectors, and returns the list of ServerStatusRequests that match those selectors. -func (c *serverStatusRequests) List(opts meta_v1.ListOptions) (result *v1.ServerStatusRequestList, err error) { +func (c *serverStatusRequests) List(opts metav1.ListOptions) (result *v1.ServerStatusRequestList, err error) { result = &v1.ServerStatusRequestList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *serverStatusRequests) List(opts meta_v1.ListOptions) (result *v1.Server } // Watch returns a watch.Interface that watches the requested serverStatusRequests. -func (c *serverStatusRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *serverStatusRequests) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *serverStatusRequests) UpdateStatus(serverStatusRequest *v1.ServerStatus } // Delete takes name of the serverStatusRequest and deletes it. Returns an error if one occurs. -func (c *serverStatusRequests) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *serverStatusRequests) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("serverstatusrequests"). @@ -149,7 +149,7 @@ func (c *serverStatusRequests) Delete(name string, options *meta_v1.DeleteOption } // DeleteCollection deletes a collection of objects. -func (c *serverStatusRequests) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *serverStatusRequests) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("serverstatusrequests"). diff --git a/pkg/generated/clientset/versioned/typed/ark/v1/volumesnapshotlocation.go b/pkg/generated/clientset/versioned/typed/ark/v1/volumesnapshotlocation.go index 5c474f5c9..956f0d18a 100644 --- a/pkg/generated/clientset/versioned/typed/ark/v1/volumesnapshotlocation.go +++ b/pkg/generated/clientset/versioned/typed/ark/v1/volumesnapshotlocation.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/ark/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type VolumeSnapshotLocationInterface interface { Create(*v1.VolumeSnapshotLocation) (*v1.VolumeSnapshotLocation, error) Update(*v1.VolumeSnapshotLocation) (*v1.VolumeSnapshotLocation, error) UpdateStatus(*v1.VolumeSnapshotLocation) (*v1.VolumeSnapshotLocation, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.VolumeSnapshotLocation, error) - List(opts meta_v1.ListOptions) (*v1.VolumeSnapshotLocationList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.VolumeSnapshotLocation, error) + List(opts metav1.ListOptions) (*v1.VolumeSnapshotLocationList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.VolumeSnapshotLocation, err error) VolumeSnapshotLocationExpansion } @@ -62,7 +62,7 @@ func newVolumeSnapshotLocations(c *ArkV1Client, namespace string) *volumeSnapsho } // Get takes name of the volumeSnapshotLocation, and returns the corresponding volumeSnapshotLocation object, and an error if there is any. -func (c *volumeSnapshotLocations) Get(name string, options meta_v1.GetOptions) (result *v1.VolumeSnapshotLocation, err error) { +func (c *volumeSnapshotLocations) Get(name string, options metav1.GetOptions) (result *v1.VolumeSnapshotLocation, err error) { result = &v1.VolumeSnapshotLocation{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *volumeSnapshotLocations) Get(name string, options meta_v1.GetOptions) ( } // List takes label and field selectors, and returns the list of VolumeSnapshotLocations that match those selectors. -func (c *volumeSnapshotLocations) List(opts meta_v1.ListOptions) (result *v1.VolumeSnapshotLocationList, err error) { +func (c *volumeSnapshotLocations) List(opts metav1.ListOptions) (result *v1.VolumeSnapshotLocationList, err error) { result = &v1.VolumeSnapshotLocationList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *volumeSnapshotLocations) List(opts meta_v1.ListOptions) (result *v1.Vol } // Watch returns a watch.Interface that watches the requested volumeSnapshotLocations. -func (c *volumeSnapshotLocations) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *volumeSnapshotLocations) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *volumeSnapshotLocations) UpdateStatus(volumeSnapshotLocation *v1.Volume } // Delete takes name of the volumeSnapshotLocation and deletes it. Returns an error if one occurs. -func (c *volumeSnapshotLocations) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *volumeSnapshotLocations) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("volumesnapshotlocations"). @@ -149,7 +149,7 @@ func (c *volumeSnapshotLocations) Delete(name string, options *meta_v1.DeleteOpt } // DeleteCollection deletes a collection of objects. -func (c *volumeSnapshotLocations) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *volumeSnapshotLocations) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("volumesnapshotlocations"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/backup.go b/pkg/generated/clientset/versioned/typed/velero/v1/backup.go index 9ab676446..1efcdf6a4 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/backup.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/backup.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type BackupInterface interface { Create(*v1.Backup) (*v1.Backup, error) Update(*v1.Backup) (*v1.Backup, error) UpdateStatus(*v1.Backup) (*v1.Backup, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Backup, error) - List(opts meta_v1.ListOptions) (*v1.BackupList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Backup, error) + List(opts metav1.ListOptions) (*v1.BackupList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Backup, err error) BackupExpansion } @@ -62,7 +62,7 @@ func newBackups(c *VeleroV1Client, namespace string) *backups { } // Get takes name of the backup, and returns the corresponding backup object, and an error if there is any. -func (c *backups) Get(name string, options meta_v1.GetOptions) (result *v1.Backup, err error) { +func (c *backups) Get(name string, options metav1.GetOptions) (result *v1.Backup, err error) { result = &v1.Backup{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *backups) Get(name string, options meta_v1.GetOptions) (result *v1.Backu } // List takes label and field selectors, and returns the list of Backups that match those selectors. -func (c *backups) List(opts meta_v1.ListOptions) (result *v1.BackupList, err error) { +func (c *backups) List(opts metav1.ListOptions) (result *v1.BackupList, err error) { result = &v1.BackupList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *backups) List(opts meta_v1.ListOptions) (result *v1.BackupList, err err } // Watch returns a watch.Interface that watches the requested backups. -func (c *backups) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *backups) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *backups) UpdateStatus(backup *v1.Backup) (result *v1.Backup, err error) } // Delete takes name of the backup and deletes it. Returns an error if one occurs. -func (c *backups) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *backups) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backups"). @@ -149,7 +149,7 @@ func (c *backups) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *backups) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *backups) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backups"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/backupstoragelocation.go b/pkg/generated/clientset/versioned/typed/velero/v1/backupstoragelocation.go index b5ed16e2a..f06faca87 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/backupstoragelocation.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/backupstoragelocation.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type BackupStorageLocationInterface interface { Create(*v1.BackupStorageLocation) (*v1.BackupStorageLocation, error) Update(*v1.BackupStorageLocation) (*v1.BackupStorageLocation, error) UpdateStatus(*v1.BackupStorageLocation) (*v1.BackupStorageLocation, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.BackupStorageLocation, error) - List(opts meta_v1.ListOptions) (*v1.BackupStorageLocationList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.BackupStorageLocation, error) + List(opts metav1.ListOptions) (*v1.BackupStorageLocationList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.BackupStorageLocation, err error) BackupStorageLocationExpansion } @@ -62,7 +62,7 @@ func newBackupStorageLocations(c *VeleroV1Client, namespace string) *backupStora } // Get takes name of the backupStorageLocation, and returns the corresponding backupStorageLocation object, and an error if there is any. -func (c *backupStorageLocations) Get(name string, options meta_v1.GetOptions) (result *v1.BackupStorageLocation, err error) { +func (c *backupStorageLocations) Get(name string, options metav1.GetOptions) (result *v1.BackupStorageLocation, err error) { result = &v1.BackupStorageLocation{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *backupStorageLocations) Get(name string, options meta_v1.GetOptions) (r } // List takes label and field selectors, and returns the list of BackupStorageLocations that match those selectors. -func (c *backupStorageLocations) List(opts meta_v1.ListOptions) (result *v1.BackupStorageLocationList, err error) { +func (c *backupStorageLocations) List(opts metav1.ListOptions) (result *v1.BackupStorageLocationList, err error) { result = &v1.BackupStorageLocationList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *backupStorageLocations) List(opts meta_v1.ListOptions) (result *v1.Back } // Watch returns a watch.Interface that watches the requested backupStorageLocations. -func (c *backupStorageLocations) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *backupStorageLocations) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *backupStorageLocations) UpdateStatus(backupStorageLocation *v1.BackupSt } // Delete takes name of the backupStorageLocation and deletes it. Returns an error if one occurs. -func (c *backupStorageLocations) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *backupStorageLocations) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backupstoragelocations"). @@ -149,7 +149,7 @@ func (c *backupStorageLocations) Delete(name string, options *meta_v1.DeleteOpti } // DeleteCollection deletes a collection of objects. -func (c *backupStorageLocations) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *backupStorageLocations) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("backupstoragelocations"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/deletebackuprequest.go b/pkg/generated/clientset/versioned/typed/velero/v1/deletebackuprequest.go index 9d6b6597b..5d5e68fbc 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/deletebackuprequest.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/deletebackuprequest.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type DeleteBackupRequestInterface interface { Create(*v1.DeleteBackupRequest) (*v1.DeleteBackupRequest, error) Update(*v1.DeleteBackupRequest) (*v1.DeleteBackupRequest, error) UpdateStatus(*v1.DeleteBackupRequest) (*v1.DeleteBackupRequest, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.DeleteBackupRequest, error) - List(opts meta_v1.ListOptions) (*v1.DeleteBackupRequestList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.DeleteBackupRequest, error) + List(opts metav1.ListOptions) (*v1.DeleteBackupRequestList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DeleteBackupRequest, err error) DeleteBackupRequestExpansion } @@ -62,7 +62,7 @@ func newDeleteBackupRequests(c *VeleroV1Client, namespace string) *deleteBackupR } // Get takes name of the deleteBackupRequest, and returns the corresponding deleteBackupRequest object, and an error if there is any. -func (c *deleteBackupRequests) Get(name string, options meta_v1.GetOptions) (result *v1.DeleteBackupRequest, err error) { +func (c *deleteBackupRequests) Get(name string, options metav1.GetOptions) (result *v1.DeleteBackupRequest, err error) { result = &v1.DeleteBackupRequest{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *deleteBackupRequests) Get(name string, options meta_v1.GetOptions) (res } // List takes label and field selectors, and returns the list of DeleteBackupRequests that match those selectors. -func (c *deleteBackupRequests) List(opts meta_v1.ListOptions) (result *v1.DeleteBackupRequestList, err error) { +func (c *deleteBackupRequests) List(opts metav1.ListOptions) (result *v1.DeleteBackupRequestList, err error) { result = &v1.DeleteBackupRequestList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *deleteBackupRequests) List(opts meta_v1.ListOptions) (result *v1.Delete } // Watch returns a watch.Interface that watches the requested deleteBackupRequests. -func (c *deleteBackupRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *deleteBackupRequests) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *deleteBackupRequests) UpdateStatus(deleteBackupRequest *v1.DeleteBackup } // Delete takes name of the deleteBackupRequest and deletes it. Returns an error if one occurs. -func (c *deleteBackupRequests) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *deleteBackupRequests) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("deletebackuprequests"). @@ -149,7 +149,7 @@ func (c *deleteBackupRequests) Delete(name string, options *meta_v1.DeleteOption } // DeleteCollection deletes a collection of objects. -func (c *deleteBackupRequests) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *deleteBackupRequests) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("deletebackuprequests"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/downloadrequest.go b/pkg/generated/clientset/versioned/typed/velero/v1/downloadrequest.go index 5170f9e36..b226b39b1 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/downloadrequest.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/downloadrequest.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type DownloadRequestInterface interface { Create(*v1.DownloadRequest) (*v1.DownloadRequest, error) Update(*v1.DownloadRequest) (*v1.DownloadRequest, error) UpdateStatus(*v1.DownloadRequest) (*v1.DownloadRequest, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.DownloadRequest, error) - List(opts meta_v1.ListOptions) (*v1.DownloadRequestList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.DownloadRequest, error) + List(opts metav1.ListOptions) (*v1.DownloadRequestList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DownloadRequest, err error) DownloadRequestExpansion } @@ -62,7 +62,7 @@ func newDownloadRequests(c *VeleroV1Client, namespace string) *downloadRequests } // Get takes name of the downloadRequest, and returns the corresponding downloadRequest object, and an error if there is any. -func (c *downloadRequests) Get(name string, options meta_v1.GetOptions) (result *v1.DownloadRequest, err error) { +func (c *downloadRequests) Get(name string, options metav1.GetOptions) (result *v1.DownloadRequest, err error) { result = &v1.DownloadRequest{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *downloadRequests) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of DownloadRequests that match those selectors. -func (c *downloadRequests) List(opts meta_v1.ListOptions) (result *v1.DownloadRequestList, err error) { +func (c *downloadRequests) List(opts metav1.ListOptions) (result *v1.DownloadRequestList, err error) { result = &v1.DownloadRequestList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *downloadRequests) List(opts meta_v1.ListOptions) (result *v1.DownloadRe } // Watch returns a watch.Interface that watches the requested downloadRequests. -func (c *downloadRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *downloadRequests) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *downloadRequests) UpdateStatus(downloadRequest *v1.DownloadRequest) (re } // Delete takes name of the downloadRequest and deletes it. Returns an error if one occurs. -func (c *downloadRequests) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *downloadRequests) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("downloadrequests"). @@ -149,7 +149,7 @@ func (c *downloadRequests) Delete(name string, options *meta_v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *downloadRequests) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *downloadRequests) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("downloadrequests"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backup.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backup.go index bda0094df..756ca1f40 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backup.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backup.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var backupsResource = schema.GroupVersionResource{Group: "velero.io", Version: " var backupsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "Backup"} // Get takes name of the backup, and returns the corresponding backup object, and an error if there is any. -func (c *FakeBackups) Get(name string, options v1.GetOptions) (result *velero_v1.Backup, err error) { +func (c *FakeBackups) Get(name string, options v1.GetOptions) (result *velerov1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(backupsResource, c.ns, name), &velero_v1.Backup{}) + Invokes(testing.NewGetAction(backupsResource, c.ns, name), &velerov1.Backup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Backup), err + return obj.(*velerov1.Backup), err } // List takes label and field selectors, and returns the list of Backups that match those selectors. -func (c *FakeBackups) List(opts v1.ListOptions) (result *velero_v1.BackupList, err error) { +func (c *FakeBackups) List(opts v1.ListOptions) (result *velerov1.BackupList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(backupsResource, backupsKind, c.ns, opts), &velero_v1.BackupList{}) + Invokes(testing.NewListAction(backupsResource, backupsKind, c.ns, opts), &velerov1.BackupList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeBackups) List(opts v1.ListOptions) (result *velero_v1.BackupList, e if label == nil { label = labels.Everything() } - list := &velero_v1.BackupList{ListMeta: obj.(*velero_v1.BackupList).ListMeta} - for _, item := range obj.(*velero_v1.BackupList).Items { + list := &velerov1.BackupList{ListMeta: obj.(*velerov1.BackupList).ListMeta} + for _, item := range obj.(*velerov1.BackupList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeBackups) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a backup and creates it. Returns the server's representation of the backup, and an error, if there is any. -func (c *FakeBackups) Create(backup *velero_v1.Backup) (result *velero_v1.Backup, err error) { +func (c *FakeBackups) Create(backup *velerov1.Backup) (result *velerov1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(backupsResource, c.ns, backup), &velero_v1.Backup{}) + Invokes(testing.NewCreateAction(backupsResource, c.ns, backup), &velerov1.Backup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Backup), err + return obj.(*velerov1.Backup), err } // Update takes the representation of a backup and updates it. Returns the server's representation of the backup, and an error, if there is any. -func (c *FakeBackups) Update(backup *velero_v1.Backup) (result *velero_v1.Backup, err error) { +func (c *FakeBackups) Update(backup *velerov1.Backup) (result *velerov1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(backupsResource, c.ns, backup), &velero_v1.Backup{}) + Invokes(testing.NewUpdateAction(backupsResource, c.ns, backup), &velerov1.Backup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Backup), err + return obj.(*velerov1.Backup), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeBackups) UpdateStatus(backup *velero_v1.Backup) (*velero_v1.Backup, error) { +func (c *FakeBackups) UpdateStatus(backup *velerov1.Backup) (*velerov1.Backup, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(backupsResource, "status", c.ns, backup), &velero_v1.Backup{}) + Invokes(testing.NewUpdateSubresourceAction(backupsResource, "status", c.ns, backup), &velerov1.Backup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Backup), err + return obj.(*velerov1.Backup), err } // Delete takes name of the backup and deletes it. Returns an error if one occurs. func (c *FakeBackups) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(backupsResource, c.ns, name), &velero_v1.Backup{}) + Invokes(testing.NewDeleteAction(backupsResource, c.ns, name), &velerov1.Backup{}) return err } @@ -124,17 +124,17 @@ func (c *FakeBackups) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeBackups) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(backupsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.BackupList{}) + _, err := c.Fake.Invokes(action, &velerov1.BackupList{}) return err } // Patch applies the patch and returns the patched backup. -func (c *FakeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.Backup, err error) { +func (c *FakeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.Backup, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(backupsResource, c.ns, name, data, subresources...), &velero_v1.Backup{}) + Invokes(testing.NewPatchSubresourceAction(backupsResource, c.ns, name, data, subresources...), &velerov1.Backup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Backup), err + return obj.(*velerov1.Backup), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backupstoragelocation.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backupstoragelocation.go index d80639b47..8315df457 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backupstoragelocation.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_backupstoragelocation.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var backupstoragelocationsResource = schema.GroupVersionResource{Group: "velero. var backupstoragelocationsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "BackupStorageLocation"} // Get takes name of the backupStorageLocation, and returns the corresponding backupStorageLocation object, and an error if there is any. -func (c *FakeBackupStorageLocations) Get(name string, options v1.GetOptions) (result *velero_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Get(name string, options v1.GetOptions) (result *velerov1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(backupstoragelocationsResource, c.ns, name), &velero_v1.BackupStorageLocation{}) + Invokes(testing.NewGetAction(backupstoragelocationsResource, c.ns, name), &velerov1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.BackupStorageLocation), err + return obj.(*velerov1.BackupStorageLocation), err } // List takes label and field selectors, and returns the list of BackupStorageLocations that match those selectors. -func (c *FakeBackupStorageLocations) List(opts v1.ListOptions) (result *velero_v1.BackupStorageLocationList, err error) { +func (c *FakeBackupStorageLocations) List(opts v1.ListOptions) (result *velerov1.BackupStorageLocationList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(backupstoragelocationsResource, backupstoragelocationsKind, c.ns, opts), &velero_v1.BackupStorageLocationList{}) + Invokes(testing.NewListAction(backupstoragelocationsResource, backupstoragelocationsKind, c.ns, opts), &velerov1.BackupStorageLocationList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeBackupStorageLocations) List(opts v1.ListOptions) (result *velero_v if label == nil { label = labels.Everything() } - list := &velero_v1.BackupStorageLocationList{ListMeta: obj.(*velero_v1.BackupStorageLocationList).ListMeta} - for _, item := range obj.(*velero_v1.BackupStorageLocationList).Items { + list := &velerov1.BackupStorageLocationList{ListMeta: obj.(*velerov1.BackupStorageLocationList).ListMeta} + for _, item := range obj.(*velerov1.BackupStorageLocationList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeBackupStorageLocations) Watch(opts v1.ListOptions) (watch.Interface } // Create takes the representation of a backupStorageLocation and creates it. Returns the server's representation of the backupStorageLocation, and an error, if there is any. -func (c *FakeBackupStorageLocations) Create(backupStorageLocation *velero_v1.BackupStorageLocation) (result *velero_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Create(backupStorageLocation *velerov1.BackupStorageLocation) (result *velerov1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &velero_v1.BackupStorageLocation{}) + Invokes(testing.NewCreateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &velerov1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.BackupStorageLocation), err + return obj.(*velerov1.BackupStorageLocation), err } // Update takes the representation of a backupStorageLocation and updates it. Returns the server's representation of the backupStorageLocation, and an error, if there is any. -func (c *FakeBackupStorageLocations) Update(backupStorageLocation *velero_v1.BackupStorageLocation) (result *velero_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Update(backupStorageLocation *velerov1.BackupStorageLocation) (result *velerov1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &velero_v1.BackupStorageLocation{}) + Invokes(testing.NewUpdateAction(backupstoragelocationsResource, c.ns, backupStorageLocation), &velerov1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.BackupStorageLocation), err + return obj.(*velerov1.BackupStorageLocation), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeBackupStorageLocations) UpdateStatus(backupStorageLocation *velero_v1.BackupStorageLocation) (*velero_v1.BackupStorageLocation, error) { +func (c *FakeBackupStorageLocations) UpdateStatus(backupStorageLocation *velerov1.BackupStorageLocation) (*velerov1.BackupStorageLocation, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(backupstoragelocationsResource, "status", c.ns, backupStorageLocation), &velero_v1.BackupStorageLocation{}) + Invokes(testing.NewUpdateSubresourceAction(backupstoragelocationsResource, "status", c.ns, backupStorageLocation), &velerov1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.BackupStorageLocation), err + return obj.(*velerov1.BackupStorageLocation), err } // Delete takes name of the backupStorageLocation and deletes it. Returns an error if one occurs. func (c *FakeBackupStorageLocations) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(backupstoragelocationsResource, c.ns, name), &velero_v1.BackupStorageLocation{}) + Invokes(testing.NewDeleteAction(backupstoragelocationsResource, c.ns, name), &velerov1.BackupStorageLocation{}) return err } @@ -124,17 +124,17 @@ func (c *FakeBackupStorageLocations) Delete(name string, options *v1.DeleteOptio func (c *FakeBackupStorageLocations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(backupstoragelocationsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.BackupStorageLocationList{}) + _, err := c.Fake.Invokes(action, &velerov1.BackupStorageLocationList{}) return err } // Patch applies the patch and returns the patched backupStorageLocation. -func (c *FakeBackupStorageLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.BackupStorageLocation, err error) { +func (c *FakeBackupStorageLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.BackupStorageLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(backupstoragelocationsResource, c.ns, name, data, subresources...), &velero_v1.BackupStorageLocation{}) + Invokes(testing.NewPatchSubresourceAction(backupstoragelocationsResource, c.ns, name, data, subresources...), &velerov1.BackupStorageLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.BackupStorageLocation), err + return obj.(*velerov1.BackupStorageLocation), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_deletebackuprequest.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_deletebackuprequest.go index 7cc409638..d6ca91bca 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_deletebackuprequest.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_deletebackuprequest.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var deletebackuprequestsResource = schema.GroupVersionResource{Group: "velero.io var deletebackuprequestsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "DeleteBackupRequest"} // Get takes name of the deleteBackupRequest, and returns the corresponding deleteBackupRequest object, and an error if there is any. -func (c *FakeDeleteBackupRequests) Get(name string, options v1.GetOptions) (result *velero_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Get(name string, options v1.GetOptions) (result *velerov1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(deletebackuprequestsResource, c.ns, name), &velero_v1.DeleteBackupRequest{}) + Invokes(testing.NewGetAction(deletebackuprequestsResource, c.ns, name), &velerov1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DeleteBackupRequest), err + return obj.(*velerov1.DeleteBackupRequest), err } // List takes label and field selectors, and returns the list of DeleteBackupRequests that match those selectors. -func (c *FakeDeleteBackupRequests) List(opts v1.ListOptions) (result *velero_v1.DeleteBackupRequestList, err error) { +func (c *FakeDeleteBackupRequests) List(opts v1.ListOptions) (result *velerov1.DeleteBackupRequestList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(deletebackuprequestsResource, deletebackuprequestsKind, c.ns, opts), &velero_v1.DeleteBackupRequestList{}) + Invokes(testing.NewListAction(deletebackuprequestsResource, deletebackuprequestsKind, c.ns, opts), &velerov1.DeleteBackupRequestList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeDeleteBackupRequests) List(opts v1.ListOptions) (result *velero_v1. if label == nil { label = labels.Everything() } - list := &velero_v1.DeleteBackupRequestList{ListMeta: obj.(*velero_v1.DeleteBackupRequestList).ListMeta} - for _, item := range obj.(*velero_v1.DeleteBackupRequestList).Items { + list := &velerov1.DeleteBackupRequestList{ListMeta: obj.(*velerov1.DeleteBackupRequestList).ListMeta} + for _, item := range obj.(*velerov1.DeleteBackupRequestList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeDeleteBackupRequests) Watch(opts v1.ListOptions) (watch.Interface, } // Create takes the representation of a deleteBackupRequest and creates it. Returns the server's representation of the deleteBackupRequest, and an error, if there is any. -func (c *FakeDeleteBackupRequests) Create(deleteBackupRequest *velero_v1.DeleteBackupRequest) (result *velero_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Create(deleteBackupRequest *velerov1.DeleteBackupRequest) (result *velerov1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &velero_v1.DeleteBackupRequest{}) + Invokes(testing.NewCreateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &velerov1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DeleteBackupRequest), err + return obj.(*velerov1.DeleteBackupRequest), err } // Update takes the representation of a deleteBackupRequest and updates it. Returns the server's representation of the deleteBackupRequest, and an error, if there is any. -func (c *FakeDeleteBackupRequests) Update(deleteBackupRequest *velero_v1.DeleteBackupRequest) (result *velero_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Update(deleteBackupRequest *velerov1.DeleteBackupRequest) (result *velerov1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &velero_v1.DeleteBackupRequest{}) + Invokes(testing.NewUpdateAction(deletebackuprequestsResource, c.ns, deleteBackupRequest), &velerov1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DeleteBackupRequest), err + return obj.(*velerov1.DeleteBackupRequest), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeDeleteBackupRequests) UpdateStatus(deleteBackupRequest *velero_v1.DeleteBackupRequest) (*velero_v1.DeleteBackupRequest, error) { +func (c *FakeDeleteBackupRequests) UpdateStatus(deleteBackupRequest *velerov1.DeleteBackupRequest) (*velerov1.DeleteBackupRequest, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(deletebackuprequestsResource, "status", c.ns, deleteBackupRequest), &velero_v1.DeleteBackupRequest{}) + Invokes(testing.NewUpdateSubresourceAction(deletebackuprequestsResource, "status", c.ns, deleteBackupRequest), &velerov1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DeleteBackupRequest), err + return obj.(*velerov1.DeleteBackupRequest), err } // Delete takes name of the deleteBackupRequest and deletes it. Returns an error if one occurs. func (c *FakeDeleteBackupRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(deletebackuprequestsResource, c.ns, name), &velero_v1.DeleteBackupRequest{}) + Invokes(testing.NewDeleteAction(deletebackuprequestsResource, c.ns, name), &velerov1.DeleteBackupRequest{}) return err } @@ -124,17 +124,17 @@ func (c *FakeDeleteBackupRequests) Delete(name string, options *v1.DeleteOptions func (c *FakeDeleteBackupRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(deletebackuprequestsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.DeleteBackupRequestList{}) + _, err := c.Fake.Invokes(action, &velerov1.DeleteBackupRequestList{}) return err } // Patch applies the patch and returns the patched deleteBackupRequest. -func (c *FakeDeleteBackupRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.DeleteBackupRequest, err error) { +func (c *FakeDeleteBackupRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.DeleteBackupRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(deletebackuprequestsResource, c.ns, name, data, subresources...), &velero_v1.DeleteBackupRequest{}) + Invokes(testing.NewPatchSubresourceAction(deletebackuprequestsResource, c.ns, name, data, subresources...), &velerov1.DeleteBackupRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DeleteBackupRequest), err + return obj.(*velerov1.DeleteBackupRequest), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_downloadrequest.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_downloadrequest.go index 52e3ef577..9e4d78998 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_downloadrequest.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_downloadrequest.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var downloadrequestsResource = schema.GroupVersionResource{Group: "velero.io", V var downloadrequestsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "DownloadRequest"} // Get takes name of the downloadRequest, and returns the corresponding downloadRequest object, and an error if there is any. -func (c *FakeDownloadRequests) Get(name string, options v1.GetOptions) (result *velero_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Get(name string, options v1.GetOptions) (result *velerov1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(downloadrequestsResource, c.ns, name), &velero_v1.DownloadRequest{}) + Invokes(testing.NewGetAction(downloadrequestsResource, c.ns, name), &velerov1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DownloadRequest), err + return obj.(*velerov1.DownloadRequest), err } // List takes label and field selectors, and returns the list of DownloadRequests that match those selectors. -func (c *FakeDownloadRequests) List(opts v1.ListOptions) (result *velero_v1.DownloadRequestList, err error) { +func (c *FakeDownloadRequests) List(opts v1.ListOptions) (result *velerov1.DownloadRequestList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(downloadrequestsResource, downloadrequestsKind, c.ns, opts), &velero_v1.DownloadRequestList{}) + Invokes(testing.NewListAction(downloadrequestsResource, downloadrequestsKind, c.ns, opts), &velerov1.DownloadRequestList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeDownloadRequests) List(opts v1.ListOptions) (result *velero_v1.Down if label == nil { label = labels.Everything() } - list := &velero_v1.DownloadRequestList{ListMeta: obj.(*velero_v1.DownloadRequestList).ListMeta} - for _, item := range obj.(*velero_v1.DownloadRequestList).Items { + list := &velerov1.DownloadRequestList{ListMeta: obj.(*velerov1.DownloadRequestList).ListMeta} + for _, item := range obj.(*velerov1.DownloadRequestList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeDownloadRequests) Watch(opts v1.ListOptions) (watch.Interface, erro } // Create takes the representation of a downloadRequest and creates it. Returns the server's representation of the downloadRequest, and an error, if there is any. -func (c *FakeDownloadRequests) Create(downloadRequest *velero_v1.DownloadRequest) (result *velero_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Create(downloadRequest *velerov1.DownloadRequest) (result *velerov1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(downloadrequestsResource, c.ns, downloadRequest), &velero_v1.DownloadRequest{}) + Invokes(testing.NewCreateAction(downloadrequestsResource, c.ns, downloadRequest), &velerov1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DownloadRequest), err + return obj.(*velerov1.DownloadRequest), err } // Update takes the representation of a downloadRequest and updates it. Returns the server's representation of the downloadRequest, and an error, if there is any. -func (c *FakeDownloadRequests) Update(downloadRequest *velero_v1.DownloadRequest) (result *velero_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Update(downloadRequest *velerov1.DownloadRequest) (result *velerov1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(downloadrequestsResource, c.ns, downloadRequest), &velero_v1.DownloadRequest{}) + Invokes(testing.NewUpdateAction(downloadrequestsResource, c.ns, downloadRequest), &velerov1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DownloadRequest), err + return obj.(*velerov1.DownloadRequest), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeDownloadRequests) UpdateStatus(downloadRequest *velero_v1.DownloadRequest) (*velero_v1.DownloadRequest, error) { +func (c *FakeDownloadRequests) UpdateStatus(downloadRequest *velerov1.DownloadRequest) (*velerov1.DownloadRequest, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(downloadrequestsResource, "status", c.ns, downloadRequest), &velero_v1.DownloadRequest{}) + Invokes(testing.NewUpdateSubresourceAction(downloadrequestsResource, "status", c.ns, downloadRequest), &velerov1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DownloadRequest), err + return obj.(*velerov1.DownloadRequest), err } // Delete takes name of the downloadRequest and deletes it. Returns an error if one occurs. func (c *FakeDownloadRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(downloadrequestsResource, c.ns, name), &velero_v1.DownloadRequest{}) + Invokes(testing.NewDeleteAction(downloadrequestsResource, c.ns, name), &velerov1.DownloadRequest{}) return err } @@ -124,17 +124,17 @@ func (c *FakeDownloadRequests) Delete(name string, options *v1.DeleteOptions) er func (c *FakeDownloadRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(downloadrequestsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.DownloadRequestList{}) + _, err := c.Fake.Invokes(action, &velerov1.DownloadRequestList{}) return err } // Patch applies the patch and returns the patched downloadRequest. -func (c *FakeDownloadRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.DownloadRequest, err error) { +func (c *FakeDownloadRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.DownloadRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(downloadrequestsResource, c.ns, name, data, subresources...), &velero_v1.DownloadRequest{}) + Invokes(testing.NewPatchSubresourceAction(downloadrequestsResource, c.ns, name, data, subresources...), &velerov1.DownloadRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.DownloadRequest), err + return obj.(*velerov1.DownloadRequest), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumebackup.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumebackup.go index c4fa35d57..0743ee04d 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumebackup.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumebackup.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var podvolumebackupsResource = schema.GroupVersionResource{Group: "velero.io", V var podvolumebackupsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "PodVolumeBackup"} // Get takes name of the podVolumeBackup, and returns the corresponding podVolumeBackup object, and an error if there is any. -func (c *FakePodVolumeBackups) Get(name string, options v1.GetOptions) (result *velero_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Get(name string, options v1.GetOptions) (result *velerov1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(podvolumebackupsResource, c.ns, name), &velero_v1.PodVolumeBackup{}) + Invokes(testing.NewGetAction(podvolumebackupsResource, c.ns, name), &velerov1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeBackup), err + return obj.(*velerov1.PodVolumeBackup), err } // List takes label and field selectors, and returns the list of PodVolumeBackups that match those selectors. -func (c *FakePodVolumeBackups) List(opts v1.ListOptions) (result *velero_v1.PodVolumeBackupList, err error) { +func (c *FakePodVolumeBackups) List(opts v1.ListOptions) (result *velerov1.PodVolumeBackupList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(podvolumebackupsResource, podvolumebackupsKind, c.ns, opts), &velero_v1.PodVolumeBackupList{}) + Invokes(testing.NewListAction(podvolumebackupsResource, podvolumebackupsKind, c.ns, opts), &velerov1.PodVolumeBackupList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakePodVolumeBackups) List(opts v1.ListOptions) (result *velero_v1.PodV if label == nil { label = labels.Everything() } - list := &velero_v1.PodVolumeBackupList{ListMeta: obj.(*velero_v1.PodVolumeBackupList).ListMeta} - for _, item := range obj.(*velero_v1.PodVolumeBackupList).Items { + list := &velerov1.PodVolumeBackupList{ListMeta: obj.(*velerov1.PodVolumeBackupList).ListMeta} + for _, item := range obj.(*velerov1.PodVolumeBackupList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakePodVolumeBackups) Watch(opts v1.ListOptions) (watch.Interface, erro } // Create takes the representation of a podVolumeBackup and creates it. Returns the server's representation of the podVolumeBackup, and an error, if there is any. -func (c *FakePodVolumeBackups) Create(podVolumeBackup *velero_v1.PodVolumeBackup) (result *velero_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Create(podVolumeBackup *velerov1.PodVolumeBackup) (result *velerov1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &velero_v1.PodVolumeBackup{}) + Invokes(testing.NewCreateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &velerov1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeBackup), err + return obj.(*velerov1.PodVolumeBackup), err } // Update takes the representation of a podVolumeBackup and updates it. Returns the server's representation of the podVolumeBackup, and an error, if there is any. -func (c *FakePodVolumeBackups) Update(podVolumeBackup *velero_v1.PodVolumeBackup) (result *velero_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Update(podVolumeBackup *velerov1.PodVolumeBackup) (result *velerov1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &velero_v1.PodVolumeBackup{}) + Invokes(testing.NewUpdateAction(podvolumebackupsResource, c.ns, podVolumeBackup), &velerov1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeBackup), err + return obj.(*velerov1.PodVolumeBackup), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePodVolumeBackups) UpdateStatus(podVolumeBackup *velero_v1.PodVolumeBackup) (*velero_v1.PodVolumeBackup, error) { +func (c *FakePodVolumeBackups) UpdateStatus(podVolumeBackup *velerov1.PodVolumeBackup) (*velerov1.PodVolumeBackup, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(podvolumebackupsResource, "status", c.ns, podVolumeBackup), &velero_v1.PodVolumeBackup{}) + Invokes(testing.NewUpdateSubresourceAction(podvolumebackupsResource, "status", c.ns, podVolumeBackup), &velerov1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeBackup), err + return obj.(*velerov1.PodVolumeBackup), err } // Delete takes name of the podVolumeBackup and deletes it. Returns an error if one occurs. func (c *FakePodVolumeBackups) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(podvolumebackupsResource, c.ns, name), &velero_v1.PodVolumeBackup{}) + Invokes(testing.NewDeleteAction(podvolumebackupsResource, c.ns, name), &velerov1.PodVolumeBackup{}) return err } @@ -124,17 +124,17 @@ func (c *FakePodVolumeBackups) Delete(name string, options *v1.DeleteOptions) er func (c *FakePodVolumeBackups) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(podvolumebackupsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.PodVolumeBackupList{}) + _, err := c.Fake.Invokes(action, &velerov1.PodVolumeBackupList{}) return err } // Patch applies the patch and returns the patched podVolumeBackup. -func (c *FakePodVolumeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.PodVolumeBackup, err error) { +func (c *FakePodVolumeBackups) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.PodVolumeBackup, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(podvolumebackupsResource, c.ns, name, data, subresources...), &velero_v1.PodVolumeBackup{}) + Invokes(testing.NewPatchSubresourceAction(podvolumebackupsResource, c.ns, name, data, subresources...), &velerov1.PodVolumeBackup{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeBackup), err + return obj.(*velerov1.PodVolumeBackup), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumerestore.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumerestore.go index a4c215f6c..3df2b8379 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumerestore.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_podvolumerestore.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var podvolumerestoresResource = schema.GroupVersionResource{Group: "velero.io", var podvolumerestoresKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "PodVolumeRestore"} // Get takes name of the podVolumeRestore, and returns the corresponding podVolumeRestore object, and an error if there is any. -func (c *FakePodVolumeRestores) Get(name string, options v1.GetOptions) (result *velero_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Get(name string, options v1.GetOptions) (result *velerov1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(podvolumerestoresResource, c.ns, name), &velero_v1.PodVolumeRestore{}) + Invokes(testing.NewGetAction(podvolumerestoresResource, c.ns, name), &velerov1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeRestore), err + return obj.(*velerov1.PodVolumeRestore), err } // List takes label and field selectors, and returns the list of PodVolumeRestores that match those selectors. -func (c *FakePodVolumeRestores) List(opts v1.ListOptions) (result *velero_v1.PodVolumeRestoreList, err error) { +func (c *FakePodVolumeRestores) List(opts v1.ListOptions) (result *velerov1.PodVolumeRestoreList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(podvolumerestoresResource, podvolumerestoresKind, c.ns, opts), &velero_v1.PodVolumeRestoreList{}) + Invokes(testing.NewListAction(podvolumerestoresResource, podvolumerestoresKind, c.ns, opts), &velerov1.PodVolumeRestoreList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakePodVolumeRestores) List(opts v1.ListOptions) (result *velero_v1.Pod if label == nil { label = labels.Everything() } - list := &velero_v1.PodVolumeRestoreList{ListMeta: obj.(*velero_v1.PodVolumeRestoreList).ListMeta} - for _, item := range obj.(*velero_v1.PodVolumeRestoreList).Items { + list := &velerov1.PodVolumeRestoreList{ListMeta: obj.(*velerov1.PodVolumeRestoreList).ListMeta} + for _, item := range obj.(*velerov1.PodVolumeRestoreList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakePodVolumeRestores) Watch(opts v1.ListOptions) (watch.Interface, err } // Create takes the representation of a podVolumeRestore and creates it. Returns the server's representation of the podVolumeRestore, and an error, if there is any. -func (c *FakePodVolumeRestores) Create(podVolumeRestore *velero_v1.PodVolumeRestore) (result *velero_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Create(podVolumeRestore *velerov1.PodVolumeRestore) (result *velerov1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &velero_v1.PodVolumeRestore{}) + Invokes(testing.NewCreateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &velerov1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeRestore), err + return obj.(*velerov1.PodVolumeRestore), err } // Update takes the representation of a podVolumeRestore and updates it. Returns the server's representation of the podVolumeRestore, and an error, if there is any. -func (c *FakePodVolumeRestores) Update(podVolumeRestore *velero_v1.PodVolumeRestore) (result *velero_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Update(podVolumeRestore *velerov1.PodVolumeRestore) (result *velerov1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &velero_v1.PodVolumeRestore{}) + Invokes(testing.NewUpdateAction(podvolumerestoresResource, c.ns, podVolumeRestore), &velerov1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeRestore), err + return obj.(*velerov1.PodVolumeRestore), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePodVolumeRestores) UpdateStatus(podVolumeRestore *velero_v1.PodVolumeRestore) (*velero_v1.PodVolumeRestore, error) { +func (c *FakePodVolumeRestores) UpdateStatus(podVolumeRestore *velerov1.PodVolumeRestore) (*velerov1.PodVolumeRestore, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(podvolumerestoresResource, "status", c.ns, podVolumeRestore), &velero_v1.PodVolumeRestore{}) + Invokes(testing.NewUpdateSubresourceAction(podvolumerestoresResource, "status", c.ns, podVolumeRestore), &velerov1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeRestore), err + return obj.(*velerov1.PodVolumeRestore), err } // Delete takes name of the podVolumeRestore and deletes it. Returns an error if one occurs. func (c *FakePodVolumeRestores) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(podvolumerestoresResource, c.ns, name), &velero_v1.PodVolumeRestore{}) + Invokes(testing.NewDeleteAction(podvolumerestoresResource, c.ns, name), &velerov1.PodVolumeRestore{}) return err } @@ -124,17 +124,17 @@ func (c *FakePodVolumeRestores) Delete(name string, options *v1.DeleteOptions) e func (c *FakePodVolumeRestores) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(podvolumerestoresResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.PodVolumeRestoreList{}) + _, err := c.Fake.Invokes(action, &velerov1.PodVolumeRestoreList{}) return err } // Patch applies the patch and returns the patched podVolumeRestore. -func (c *FakePodVolumeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.PodVolumeRestore, err error) { +func (c *FakePodVolumeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.PodVolumeRestore, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(podvolumerestoresResource, c.ns, name, data, subresources...), &velero_v1.PodVolumeRestore{}) + Invokes(testing.NewPatchSubresourceAction(podvolumerestoresResource, c.ns, name, data, subresources...), &velerov1.PodVolumeRestore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.PodVolumeRestore), err + return obj.(*velerov1.PodVolumeRestore), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_resticrepository.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_resticrepository.go index 02cf48078..bfed4cb51 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_resticrepository.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_resticrepository.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var resticrepositoriesResource = schema.GroupVersionResource{Group: "velero.io", var resticrepositoriesKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "ResticRepository"} // Get takes name of the resticRepository, and returns the corresponding resticRepository object, and an error if there is any. -func (c *FakeResticRepositories) Get(name string, options v1.GetOptions) (result *velero_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Get(name string, options v1.GetOptions) (result *velerov1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(resticrepositoriesResource, c.ns, name), &velero_v1.ResticRepository{}) + Invokes(testing.NewGetAction(resticrepositoriesResource, c.ns, name), &velerov1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ResticRepository), err + return obj.(*velerov1.ResticRepository), err } // List takes label and field selectors, and returns the list of ResticRepositories that match those selectors. -func (c *FakeResticRepositories) List(opts v1.ListOptions) (result *velero_v1.ResticRepositoryList, err error) { +func (c *FakeResticRepositories) List(opts v1.ListOptions) (result *velerov1.ResticRepositoryList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(resticrepositoriesResource, resticrepositoriesKind, c.ns, opts), &velero_v1.ResticRepositoryList{}) + Invokes(testing.NewListAction(resticrepositoriesResource, resticrepositoriesKind, c.ns, opts), &velerov1.ResticRepositoryList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeResticRepositories) List(opts v1.ListOptions) (result *velero_v1.Re if label == nil { label = labels.Everything() } - list := &velero_v1.ResticRepositoryList{ListMeta: obj.(*velero_v1.ResticRepositoryList).ListMeta} - for _, item := range obj.(*velero_v1.ResticRepositoryList).Items { + list := &velerov1.ResticRepositoryList{ListMeta: obj.(*velerov1.ResticRepositoryList).ListMeta} + for _, item := range obj.(*velerov1.ResticRepositoryList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeResticRepositories) Watch(opts v1.ListOptions) (watch.Interface, er } // Create takes the representation of a resticRepository and creates it. Returns the server's representation of the resticRepository, and an error, if there is any. -func (c *FakeResticRepositories) Create(resticRepository *velero_v1.ResticRepository) (result *velero_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Create(resticRepository *velerov1.ResticRepository) (result *velerov1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(resticrepositoriesResource, c.ns, resticRepository), &velero_v1.ResticRepository{}) + Invokes(testing.NewCreateAction(resticrepositoriesResource, c.ns, resticRepository), &velerov1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ResticRepository), err + return obj.(*velerov1.ResticRepository), err } // Update takes the representation of a resticRepository and updates it. Returns the server's representation of the resticRepository, and an error, if there is any. -func (c *FakeResticRepositories) Update(resticRepository *velero_v1.ResticRepository) (result *velero_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Update(resticRepository *velerov1.ResticRepository) (result *velerov1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(resticrepositoriesResource, c.ns, resticRepository), &velero_v1.ResticRepository{}) + Invokes(testing.NewUpdateAction(resticrepositoriesResource, c.ns, resticRepository), &velerov1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ResticRepository), err + return obj.(*velerov1.ResticRepository), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeResticRepositories) UpdateStatus(resticRepository *velero_v1.ResticRepository) (*velero_v1.ResticRepository, error) { +func (c *FakeResticRepositories) UpdateStatus(resticRepository *velerov1.ResticRepository) (*velerov1.ResticRepository, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(resticrepositoriesResource, "status", c.ns, resticRepository), &velero_v1.ResticRepository{}) + Invokes(testing.NewUpdateSubresourceAction(resticrepositoriesResource, "status", c.ns, resticRepository), &velerov1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ResticRepository), err + return obj.(*velerov1.ResticRepository), err } // Delete takes name of the resticRepository and deletes it. Returns an error if one occurs. func (c *FakeResticRepositories) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(resticrepositoriesResource, c.ns, name), &velero_v1.ResticRepository{}) + Invokes(testing.NewDeleteAction(resticrepositoriesResource, c.ns, name), &velerov1.ResticRepository{}) return err } @@ -124,17 +124,17 @@ func (c *FakeResticRepositories) Delete(name string, options *v1.DeleteOptions) func (c *FakeResticRepositories) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(resticrepositoriesResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.ResticRepositoryList{}) + _, err := c.Fake.Invokes(action, &velerov1.ResticRepositoryList{}) return err } // Patch applies the patch and returns the patched resticRepository. -func (c *FakeResticRepositories) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.ResticRepository, err error) { +func (c *FakeResticRepositories) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.ResticRepository, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(resticrepositoriesResource, c.ns, name, data, subresources...), &velero_v1.ResticRepository{}) + Invokes(testing.NewPatchSubresourceAction(resticrepositoriesResource, c.ns, name, data, subresources...), &velerov1.ResticRepository{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ResticRepository), err + return obj.(*velerov1.ResticRepository), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_restore.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_restore.go index ce83c635e..1fff6e082 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_restore.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_restore.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var restoresResource = schema.GroupVersionResource{Group: "velero.io", Version: var restoresKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "Restore"} // Get takes name of the restore, and returns the corresponding restore object, and an error if there is any. -func (c *FakeRestores) Get(name string, options v1.GetOptions) (result *velero_v1.Restore, err error) { +func (c *FakeRestores) Get(name string, options v1.GetOptions) (result *velerov1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(restoresResource, c.ns, name), &velero_v1.Restore{}) + Invokes(testing.NewGetAction(restoresResource, c.ns, name), &velerov1.Restore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Restore), err + return obj.(*velerov1.Restore), err } // List takes label and field selectors, and returns the list of Restores that match those selectors. -func (c *FakeRestores) List(opts v1.ListOptions) (result *velero_v1.RestoreList, err error) { +func (c *FakeRestores) List(opts v1.ListOptions) (result *velerov1.RestoreList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(restoresResource, restoresKind, c.ns, opts), &velero_v1.RestoreList{}) + Invokes(testing.NewListAction(restoresResource, restoresKind, c.ns, opts), &velerov1.RestoreList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeRestores) List(opts v1.ListOptions) (result *velero_v1.RestoreList, if label == nil { label = labels.Everything() } - list := &velero_v1.RestoreList{ListMeta: obj.(*velero_v1.RestoreList).ListMeta} - for _, item := range obj.(*velero_v1.RestoreList).Items { + list := &velerov1.RestoreList{ListMeta: obj.(*velerov1.RestoreList).ListMeta} + for _, item := range obj.(*velerov1.RestoreList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeRestores) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a restore and creates it. Returns the server's representation of the restore, and an error, if there is any. -func (c *FakeRestores) Create(restore *velero_v1.Restore) (result *velero_v1.Restore, err error) { +func (c *FakeRestores) Create(restore *velerov1.Restore) (result *velerov1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(restoresResource, c.ns, restore), &velero_v1.Restore{}) + Invokes(testing.NewCreateAction(restoresResource, c.ns, restore), &velerov1.Restore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Restore), err + return obj.(*velerov1.Restore), err } // Update takes the representation of a restore and updates it. Returns the server's representation of the restore, and an error, if there is any. -func (c *FakeRestores) Update(restore *velero_v1.Restore) (result *velero_v1.Restore, err error) { +func (c *FakeRestores) Update(restore *velerov1.Restore) (result *velerov1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(restoresResource, c.ns, restore), &velero_v1.Restore{}) + Invokes(testing.NewUpdateAction(restoresResource, c.ns, restore), &velerov1.Restore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Restore), err + return obj.(*velerov1.Restore), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeRestores) UpdateStatus(restore *velero_v1.Restore) (*velero_v1.Restore, error) { +func (c *FakeRestores) UpdateStatus(restore *velerov1.Restore) (*velerov1.Restore, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(restoresResource, "status", c.ns, restore), &velero_v1.Restore{}) + Invokes(testing.NewUpdateSubresourceAction(restoresResource, "status", c.ns, restore), &velerov1.Restore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Restore), err + return obj.(*velerov1.Restore), err } // Delete takes name of the restore and deletes it. Returns an error if one occurs. func (c *FakeRestores) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(restoresResource, c.ns, name), &velero_v1.Restore{}) + Invokes(testing.NewDeleteAction(restoresResource, c.ns, name), &velerov1.Restore{}) return err } @@ -124,17 +124,17 @@ func (c *FakeRestores) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeRestores) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(restoresResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.RestoreList{}) + _, err := c.Fake.Invokes(action, &velerov1.RestoreList{}) return err } // Patch applies the patch and returns the patched restore. -func (c *FakeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.Restore, err error) { +func (c *FakeRestores) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.Restore, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(restoresResource, c.ns, name, data, subresources...), &velero_v1.Restore{}) + Invokes(testing.NewPatchSubresourceAction(restoresResource, c.ns, name, data, subresources...), &velerov1.Restore{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Restore), err + return obj.(*velerov1.Restore), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_schedule.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_schedule.go index de9d34d6a..6a50cfc3f 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_schedule.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_schedule.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var schedulesResource = schema.GroupVersionResource{Group: "velero.io", Version: var schedulesKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "Schedule"} // Get takes name of the schedule, and returns the corresponding schedule object, and an error if there is any. -func (c *FakeSchedules) Get(name string, options v1.GetOptions) (result *velero_v1.Schedule, err error) { +func (c *FakeSchedules) Get(name string, options v1.GetOptions) (result *velerov1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(schedulesResource, c.ns, name), &velero_v1.Schedule{}) + Invokes(testing.NewGetAction(schedulesResource, c.ns, name), &velerov1.Schedule{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Schedule), err + return obj.(*velerov1.Schedule), err } // List takes label and field selectors, and returns the list of Schedules that match those selectors. -func (c *FakeSchedules) List(opts v1.ListOptions) (result *velero_v1.ScheduleList, err error) { +func (c *FakeSchedules) List(opts v1.ListOptions) (result *velerov1.ScheduleList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(schedulesResource, schedulesKind, c.ns, opts), &velero_v1.ScheduleList{}) + Invokes(testing.NewListAction(schedulesResource, schedulesKind, c.ns, opts), &velerov1.ScheduleList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeSchedules) List(opts v1.ListOptions) (result *velero_v1.ScheduleLis if label == nil { label = labels.Everything() } - list := &velero_v1.ScheduleList{ListMeta: obj.(*velero_v1.ScheduleList).ListMeta} - for _, item := range obj.(*velero_v1.ScheduleList).Items { + list := &velerov1.ScheduleList{ListMeta: obj.(*velerov1.ScheduleList).ListMeta} + for _, item := range obj.(*velerov1.ScheduleList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeSchedules) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a schedule and creates it. Returns the server's representation of the schedule, and an error, if there is any. -func (c *FakeSchedules) Create(schedule *velero_v1.Schedule) (result *velero_v1.Schedule, err error) { +func (c *FakeSchedules) Create(schedule *velerov1.Schedule) (result *velerov1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(schedulesResource, c.ns, schedule), &velero_v1.Schedule{}) + Invokes(testing.NewCreateAction(schedulesResource, c.ns, schedule), &velerov1.Schedule{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Schedule), err + return obj.(*velerov1.Schedule), err } // Update takes the representation of a schedule and updates it. Returns the server's representation of the schedule, and an error, if there is any. -func (c *FakeSchedules) Update(schedule *velero_v1.Schedule) (result *velero_v1.Schedule, err error) { +func (c *FakeSchedules) Update(schedule *velerov1.Schedule) (result *velerov1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(schedulesResource, c.ns, schedule), &velero_v1.Schedule{}) + Invokes(testing.NewUpdateAction(schedulesResource, c.ns, schedule), &velerov1.Schedule{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Schedule), err + return obj.(*velerov1.Schedule), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeSchedules) UpdateStatus(schedule *velero_v1.Schedule) (*velero_v1.Schedule, error) { +func (c *FakeSchedules) UpdateStatus(schedule *velerov1.Schedule) (*velerov1.Schedule, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(schedulesResource, "status", c.ns, schedule), &velero_v1.Schedule{}) + Invokes(testing.NewUpdateSubresourceAction(schedulesResource, "status", c.ns, schedule), &velerov1.Schedule{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Schedule), err + return obj.(*velerov1.Schedule), err } // Delete takes name of the schedule and deletes it. Returns an error if one occurs. func (c *FakeSchedules) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(schedulesResource, c.ns, name), &velero_v1.Schedule{}) + Invokes(testing.NewDeleteAction(schedulesResource, c.ns, name), &velerov1.Schedule{}) return err } @@ -124,17 +124,17 @@ func (c *FakeSchedules) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeSchedules) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(schedulesResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.ScheduleList{}) + _, err := c.Fake.Invokes(action, &velerov1.ScheduleList{}) return err } // Patch applies the patch and returns the patched schedule. -func (c *FakeSchedules) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.Schedule, err error) { +func (c *FakeSchedules) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.Schedule, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(schedulesResource, c.ns, name, data, subresources...), &velero_v1.Schedule{}) + Invokes(testing.NewPatchSubresourceAction(schedulesResource, c.ns, name, data, subresources...), &velerov1.Schedule{}) if obj == nil { return nil, err } - return obj.(*velero_v1.Schedule), err + return obj.(*velerov1.Schedule), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_serverstatusrequest.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_serverstatusrequest.go index 9e3f95d72..559b026fd 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_serverstatusrequest.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_serverstatusrequest.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var serverstatusrequestsResource = schema.GroupVersionResource{Group: "velero.io var serverstatusrequestsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "ServerStatusRequest"} // Get takes name of the serverStatusRequest, and returns the corresponding serverStatusRequest object, and an error if there is any. -func (c *FakeServerStatusRequests) Get(name string, options v1.GetOptions) (result *velero_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Get(name string, options v1.GetOptions) (result *velerov1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(serverstatusrequestsResource, c.ns, name), &velero_v1.ServerStatusRequest{}) + Invokes(testing.NewGetAction(serverstatusrequestsResource, c.ns, name), &velerov1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ServerStatusRequest), err + return obj.(*velerov1.ServerStatusRequest), err } // List takes label and field selectors, and returns the list of ServerStatusRequests that match those selectors. -func (c *FakeServerStatusRequests) List(opts v1.ListOptions) (result *velero_v1.ServerStatusRequestList, err error) { +func (c *FakeServerStatusRequests) List(opts v1.ListOptions) (result *velerov1.ServerStatusRequestList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(serverstatusrequestsResource, serverstatusrequestsKind, c.ns, opts), &velero_v1.ServerStatusRequestList{}) + Invokes(testing.NewListAction(serverstatusrequestsResource, serverstatusrequestsKind, c.ns, opts), &velerov1.ServerStatusRequestList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeServerStatusRequests) List(opts v1.ListOptions) (result *velero_v1. if label == nil { label = labels.Everything() } - list := &velero_v1.ServerStatusRequestList{ListMeta: obj.(*velero_v1.ServerStatusRequestList).ListMeta} - for _, item := range obj.(*velero_v1.ServerStatusRequestList).Items { + list := &velerov1.ServerStatusRequestList{ListMeta: obj.(*velerov1.ServerStatusRequestList).ListMeta} + for _, item := range obj.(*velerov1.ServerStatusRequestList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeServerStatusRequests) Watch(opts v1.ListOptions) (watch.Interface, } // Create takes the representation of a serverStatusRequest and creates it. Returns the server's representation of the serverStatusRequest, and an error, if there is any. -func (c *FakeServerStatusRequests) Create(serverStatusRequest *velero_v1.ServerStatusRequest) (result *velero_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Create(serverStatusRequest *velerov1.ServerStatusRequest) (result *velerov1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &velero_v1.ServerStatusRequest{}) + Invokes(testing.NewCreateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &velerov1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ServerStatusRequest), err + return obj.(*velerov1.ServerStatusRequest), err } // Update takes the representation of a serverStatusRequest and updates it. Returns the server's representation of the serverStatusRequest, and an error, if there is any. -func (c *FakeServerStatusRequests) Update(serverStatusRequest *velero_v1.ServerStatusRequest) (result *velero_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Update(serverStatusRequest *velerov1.ServerStatusRequest) (result *velerov1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &velero_v1.ServerStatusRequest{}) + Invokes(testing.NewUpdateAction(serverstatusrequestsResource, c.ns, serverStatusRequest), &velerov1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ServerStatusRequest), err + return obj.(*velerov1.ServerStatusRequest), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeServerStatusRequests) UpdateStatus(serverStatusRequest *velero_v1.ServerStatusRequest) (*velero_v1.ServerStatusRequest, error) { +func (c *FakeServerStatusRequests) UpdateStatus(serverStatusRequest *velerov1.ServerStatusRequest) (*velerov1.ServerStatusRequest, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(serverstatusrequestsResource, "status", c.ns, serverStatusRequest), &velero_v1.ServerStatusRequest{}) + Invokes(testing.NewUpdateSubresourceAction(serverstatusrequestsResource, "status", c.ns, serverStatusRequest), &velerov1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ServerStatusRequest), err + return obj.(*velerov1.ServerStatusRequest), err } // Delete takes name of the serverStatusRequest and deletes it. Returns an error if one occurs. func (c *FakeServerStatusRequests) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(serverstatusrequestsResource, c.ns, name), &velero_v1.ServerStatusRequest{}) + Invokes(testing.NewDeleteAction(serverstatusrequestsResource, c.ns, name), &velerov1.ServerStatusRequest{}) return err } @@ -124,17 +124,17 @@ func (c *FakeServerStatusRequests) Delete(name string, options *v1.DeleteOptions func (c *FakeServerStatusRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(serverstatusrequestsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.ServerStatusRequestList{}) + _, err := c.Fake.Invokes(action, &velerov1.ServerStatusRequestList{}) return err } // Patch applies the patch and returns the patched serverStatusRequest. -func (c *FakeServerStatusRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.ServerStatusRequest, err error) { +func (c *FakeServerStatusRequests) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.ServerStatusRequest, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(serverstatusrequestsResource, c.ns, name, data, subresources...), &velero_v1.ServerStatusRequest{}) + Invokes(testing.NewPatchSubresourceAction(serverstatusrequestsResource, c.ns, name, data, subresources...), &velerov1.ServerStatusRequest{}) if obj == nil { return nil, err } - return obj.(*velero_v1.ServerStatusRequest), err + return obj.(*velerov1.ServerStatusRequest), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_volumesnapshotlocation.go b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_volumesnapshotlocation.go index bc0fd00bc..c40ec1c93 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_volumesnapshotlocation.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/fake/fake_volumesnapshotlocation.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var volumesnapshotlocationsResource = schema.GroupVersionResource{Group: "velero var volumesnapshotlocationsKind = schema.GroupVersionKind{Group: "velero.io", Version: "v1", Kind: "VolumeSnapshotLocation"} // Get takes name of the volumeSnapshotLocation, and returns the corresponding volumeSnapshotLocation object, and an error if there is any. -func (c *FakeVolumeSnapshotLocations) Get(name string, options v1.GetOptions) (result *velero_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Get(name string, options v1.GetOptions) (result *velerov1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(volumesnapshotlocationsResource, c.ns, name), &velero_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewGetAction(volumesnapshotlocationsResource, c.ns, name), &velerov1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.VolumeSnapshotLocation), err + return obj.(*velerov1.VolumeSnapshotLocation), err } // List takes label and field selectors, and returns the list of VolumeSnapshotLocations that match those selectors. -func (c *FakeVolumeSnapshotLocations) List(opts v1.ListOptions) (result *velero_v1.VolumeSnapshotLocationList, err error) { +func (c *FakeVolumeSnapshotLocations) List(opts v1.ListOptions) (result *velerov1.VolumeSnapshotLocationList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(volumesnapshotlocationsResource, volumesnapshotlocationsKind, c.ns, opts), &velero_v1.VolumeSnapshotLocationList{}) + Invokes(testing.NewListAction(volumesnapshotlocationsResource, volumesnapshotlocationsKind, c.ns, opts), &velerov1.VolumeSnapshotLocationList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeVolumeSnapshotLocations) List(opts v1.ListOptions) (result *velero_ if label == nil { label = labels.Everything() } - list := &velero_v1.VolumeSnapshotLocationList{ListMeta: obj.(*velero_v1.VolumeSnapshotLocationList).ListMeta} - for _, item := range obj.(*velero_v1.VolumeSnapshotLocationList).Items { + list := &velerov1.VolumeSnapshotLocationList{ListMeta: obj.(*velerov1.VolumeSnapshotLocationList).ListMeta} + for _, item := range obj.(*velerov1.VolumeSnapshotLocationList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeVolumeSnapshotLocations) Watch(opts v1.ListOptions) (watch.Interfac } // Create takes the representation of a volumeSnapshotLocation and creates it. Returns the server's representation of the volumeSnapshotLocation, and an error, if there is any. -func (c *FakeVolumeSnapshotLocations) Create(volumeSnapshotLocation *velero_v1.VolumeSnapshotLocation) (result *velero_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Create(volumeSnapshotLocation *velerov1.VolumeSnapshotLocation) (result *velerov1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &velero_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewCreateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &velerov1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.VolumeSnapshotLocation), err + return obj.(*velerov1.VolumeSnapshotLocation), err } // Update takes the representation of a volumeSnapshotLocation and updates it. Returns the server's representation of the volumeSnapshotLocation, and an error, if there is any. -func (c *FakeVolumeSnapshotLocations) Update(volumeSnapshotLocation *velero_v1.VolumeSnapshotLocation) (result *velero_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Update(volumeSnapshotLocation *velerov1.VolumeSnapshotLocation) (result *velerov1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &velero_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewUpdateAction(volumesnapshotlocationsResource, c.ns, volumeSnapshotLocation), &velerov1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.VolumeSnapshotLocation), err + return obj.(*velerov1.VolumeSnapshotLocation), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeVolumeSnapshotLocations) UpdateStatus(volumeSnapshotLocation *velero_v1.VolumeSnapshotLocation) (*velero_v1.VolumeSnapshotLocation, error) { +func (c *FakeVolumeSnapshotLocations) UpdateStatus(volumeSnapshotLocation *velerov1.VolumeSnapshotLocation) (*velerov1.VolumeSnapshotLocation, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(volumesnapshotlocationsResource, "status", c.ns, volumeSnapshotLocation), &velero_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewUpdateSubresourceAction(volumesnapshotlocationsResource, "status", c.ns, volumeSnapshotLocation), &velerov1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.VolumeSnapshotLocation), err + return obj.(*velerov1.VolumeSnapshotLocation), err } // Delete takes name of the volumeSnapshotLocation and deletes it. Returns an error if one occurs. func (c *FakeVolumeSnapshotLocations) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(volumesnapshotlocationsResource, c.ns, name), &velero_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewDeleteAction(volumesnapshotlocationsResource, c.ns, name), &velerov1.VolumeSnapshotLocation{}) return err } @@ -124,17 +124,17 @@ func (c *FakeVolumeSnapshotLocations) Delete(name string, options *v1.DeleteOpti func (c *FakeVolumeSnapshotLocations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(volumesnapshotlocationsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &velero_v1.VolumeSnapshotLocationList{}) + _, err := c.Fake.Invokes(action, &velerov1.VolumeSnapshotLocationList{}) return err } // Patch applies the patch and returns the patched volumeSnapshotLocation. -func (c *FakeVolumeSnapshotLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velero_v1.VolumeSnapshotLocation, err error) { +func (c *FakeVolumeSnapshotLocations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *velerov1.VolumeSnapshotLocation, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(volumesnapshotlocationsResource, c.ns, name, data, subresources...), &velero_v1.VolumeSnapshotLocation{}) + Invokes(testing.NewPatchSubresourceAction(volumesnapshotlocationsResource, c.ns, name, data, subresources...), &velerov1.VolumeSnapshotLocation{}) if obj == nil { return nil, err } - return obj.(*velero_v1.VolumeSnapshotLocation), err + return obj.(*velerov1.VolumeSnapshotLocation), err } diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/podvolumebackup.go b/pkg/generated/clientset/versioned/typed/velero/v1/podvolumebackup.go index 6ce585bad..4f083966a 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/podvolumebackup.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/podvolumebackup.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type PodVolumeBackupInterface interface { Create(*v1.PodVolumeBackup) (*v1.PodVolumeBackup, error) Update(*v1.PodVolumeBackup) (*v1.PodVolumeBackup, error) UpdateStatus(*v1.PodVolumeBackup) (*v1.PodVolumeBackup, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.PodVolumeBackup, error) - List(opts meta_v1.ListOptions) (*v1.PodVolumeBackupList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.PodVolumeBackup, error) + List(opts metav1.ListOptions) (*v1.PodVolumeBackupList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PodVolumeBackup, err error) PodVolumeBackupExpansion } @@ -62,7 +62,7 @@ func newPodVolumeBackups(c *VeleroV1Client, namespace string) *podVolumeBackups } // Get takes name of the podVolumeBackup, and returns the corresponding podVolumeBackup object, and an error if there is any. -func (c *podVolumeBackups) Get(name string, options meta_v1.GetOptions) (result *v1.PodVolumeBackup, err error) { +func (c *podVolumeBackups) Get(name string, options metav1.GetOptions) (result *v1.PodVolumeBackup, err error) { result = &v1.PodVolumeBackup{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *podVolumeBackups) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of PodVolumeBackups that match those selectors. -func (c *podVolumeBackups) List(opts meta_v1.ListOptions) (result *v1.PodVolumeBackupList, err error) { +func (c *podVolumeBackups) List(opts metav1.ListOptions) (result *v1.PodVolumeBackupList, err error) { result = &v1.PodVolumeBackupList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *podVolumeBackups) List(opts meta_v1.ListOptions) (result *v1.PodVolumeB } // Watch returns a watch.Interface that watches the requested podVolumeBackups. -func (c *podVolumeBackups) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *podVolumeBackups) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *podVolumeBackups) UpdateStatus(podVolumeBackup *v1.PodVolumeBackup) (re } // Delete takes name of the podVolumeBackup and deletes it. Returns an error if one occurs. -func (c *podVolumeBackups) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *podVolumeBackups) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumebackups"). @@ -149,7 +149,7 @@ func (c *podVolumeBackups) Delete(name string, options *meta_v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *podVolumeBackups) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *podVolumeBackups) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumebackups"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/podvolumerestore.go b/pkg/generated/clientset/versioned/typed/velero/v1/podvolumerestore.go index ef70373f9..3c2c350e8 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/podvolumerestore.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/podvolumerestore.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type PodVolumeRestoreInterface interface { Create(*v1.PodVolumeRestore) (*v1.PodVolumeRestore, error) Update(*v1.PodVolumeRestore) (*v1.PodVolumeRestore, error) UpdateStatus(*v1.PodVolumeRestore) (*v1.PodVolumeRestore, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.PodVolumeRestore, error) - List(opts meta_v1.ListOptions) (*v1.PodVolumeRestoreList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.PodVolumeRestore, error) + List(opts metav1.ListOptions) (*v1.PodVolumeRestoreList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.PodVolumeRestore, err error) PodVolumeRestoreExpansion } @@ -62,7 +62,7 @@ func newPodVolumeRestores(c *VeleroV1Client, namespace string) *podVolumeRestore } // Get takes name of the podVolumeRestore, and returns the corresponding podVolumeRestore object, and an error if there is any. -func (c *podVolumeRestores) Get(name string, options meta_v1.GetOptions) (result *v1.PodVolumeRestore, err error) { +func (c *podVolumeRestores) Get(name string, options metav1.GetOptions) (result *v1.PodVolumeRestore, err error) { result = &v1.PodVolumeRestore{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *podVolumeRestores) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of PodVolumeRestores that match those selectors. -func (c *podVolumeRestores) List(opts meta_v1.ListOptions) (result *v1.PodVolumeRestoreList, err error) { +func (c *podVolumeRestores) List(opts metav1.ListOptions) (result *v1.PodVolumeRestoreList, err error) { result = &v1.PodVolumeRestoreList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *podVolumeRestores) List(opts meta_v1.ListOptions) (result *v1.PodVolume } // Watch returns a watch.Interface that watches the requested podVolumeRestores. -func (c *podVolumeRestores) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *podVolumeRestores) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *podVolumeRestores) UpdateStatus(podVolumeRestore *v1.PodVolumeRestore) } // Delete takes name of the podVolumeRestore and deletes it. Returns an error if one occurs. -func (c *podVolumeRestores) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *podVolumeRestores) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumerestores"). @@ -149,7 +149,7 @@ func (c *podVolumeRestores) Delete(name string, options *meta_v1.DeleteOptions) } // DeleteCollection deletes a collection of objects. -func (c *podVolumeRestores) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *podVolumeRestores) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("podvolumerestores"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/resticrepository.go b/pkg/generated/clientset/versioned/typed/velero/v1/resticrepository.go index 934e94a30..13b39a25b 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/resticrepository.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/resticrepository.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type ResticRepositoryInterface interface { Create(*v1.ResticRepository) (*v1.ResticRepository, error) Update(*v1.ResticRepository) (*v1.ResticRepository, error) UpdateStatus(*v1.ResticRepository) (*v1.ResticRepository, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.ResticRepository, error) - List(opts meta_v1.ListOptions) (*v1.ResticRepositoryList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.ResticRepository, error) + List(opts metav1.ListOptions) (*v1.ResticRepositoryList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ResticRepository, err error) ResticRepositoryExpansion } @@ -62,7 +62,7 @@ func newResticRepositories(c *VeleroV1Client, namespace string) *resticRepositor } // Get takes name of the resticRepository, and returns the corresponding resticRepository object, and an error if there is any. -func (c *resticRepositories) Get(name string, options meta_v1.GetOptions) (result *v1.ResticRepository, err error) { +func (c *resticRepositories) Get(name string, options metav1.GetOptions) (result *v1.ResticRepository, err error) { result = &v1.ResticRepository{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *resticRepositories) Get(name string, options meta_v1.GetOptions) (resul } // List takes label and field selectors, and returns the list of ResticRepositories that match those selectors. -func (c *resticRepositories) List(opts meta_v1.ListOptions) (result *v1.ResticRepositoryList, err error) { +func (c *resticRepositories) List(opts metav1.ListOptions) (result *v1.ResticRepositoryList, err error) { result = &v1.ResticRepositoryList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *resticRepositories) List(opts meta_v1.ListOptions) (result *v1.ResticRe } // Watch returns a watch.Interface that watches the requested resticRepositories. -func (c *resticRepositories) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *resticRepositories) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *resticRepositories) UpdateStatus(resticRepository *v1.ResticRepository) } // Delete takes name of the resticRepository and deletes it. Returns an error if one occurs. -func (c *resticRepositories) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *resticRepositories) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("resticrepositories"). @@ -149,7 +149,7 @@ func (c *resticRepositories) Delete(name string, options *meta_v1.DeleteOptions) } // DeleteCollection deletes a collection of objects. -func (c *resticRepositories) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *resticRepositories) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("resticrepositories"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/restore.go b/pkg/generated/clientset/versioned/typed/velero/v1/restore.go index bc71ad97d..195e0ad5c 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/restore.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/restore.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type RestoreInterface interface { Create(*v1.Restore) (*v1.Restore, error) Update(*v1.Restore) (*v1.Restore, error) UpdateStatus(*v1.Restore) (*v1.Restore, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Restore, error) - List(opts meta_v1.ListOptions) (*v1.RestoreList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Restore, error) + List(opts metav1.ListOptions) (*v1.RestoreList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Restore, err error) RestoreExpansion } @@ -62,7 +62,7 @@ func newRestores(c *VeleroV1Client, namespace string) *restores { } // Get takes name of the restore, and returns the corresponding restore object, and an error if there is any. -func (c *restores) Get(name string, options meta_v1.GetOptions) (result *v1.Restore, err error) { +func (c *restores) Get(name string, options metav1.GetOptions) (result *v1.Restore, err error) { result = &v1.Restore{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *restores) Get(name string, options meta_v1.GetOptions) (result *v1.Rest } // List takes label and field selectors, and returns the list of Restores that match those selectors. -func (c *restores) List(opts meta_v1.ListOptions) (result *v1.RestoreList, err error) { +func (c *restores) List(opts metav1.ListOptions) (result *v1.RestoreList, err error) { result = &v1.RestoreList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *restores) List(opts meta_v1.ListOptions) (result *v1.RestoreList, err e } // Watch returns a watch.Interface that watches the requested restores. -func (c *restores) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *restores) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *restores) UpdateStatus(restore *v1.Restore) (result *v1.Restore, err er } // Delete takes name of the restore and deletes it. Returns an error if one occurs. -func (c *restores) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *restores) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("restores"). @@ -149,7 +149,7 @@ func (c *restores) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *restores) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *restores) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("restores"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/schedule.go b/pkg/generated/clientset/versioned/typed/velero/v1/schedule.go index 462cbc0fb..f87873b09 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/schedule.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/schedule.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type ScheduleInterface interface { Create(*v1.Schedule) (*v1.Schedule, error) Update(*v1.Schedule) (*v1.Schedule, error) UpdateStatus(*v1.Schedule) (*v1.Schedule, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Schedule, error) - List(opts meta_v1.ListOptions) (*v1.ScheduleList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Schedule, error) + List(opts metav1.ListOptions) (*v1.ScheduleList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Schedule, err error) ScheduleExpansion } @@ -62,7 +62,7 @@ func newSchedules(c *VeleroV1Client, namespace string) *schedules { } // Get takes name of the schedule, and returns the corresponding schedule object, and an error if there is any. -func (c *schedules) Get(name string, options meta_v1.GetOptions) (result *v1.Schedule, err error) { +func (c *schedules) Get(name string, options metav1.GetOptions) (result *v1.Schedule, err error) { result = &v1.Schedule{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *schedules) Get(name string, options meta_v1.GetOptions) (result *v1.Sch } // List takes label and field selectors, and returns the list of Schedules that match those selectors. -func (c *schedules) List(opts meta_v1.ListOptions) (result *v1.ScheduleList, err error) { +func (c *schedules) List(opts metav1.ListOptions) (result *v1.ScheduleList, err error) { result = &v1.ScheduleList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *schedules) List(opts meta_v1.ListOptions) (result *v1.ScheduleList, err } // Watch returns a watch.Interface that watches the requested schedules. -func (c *schedules) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *schedules) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *schedules) UpdateStatus(schedule *v1.Schedule) (result *v1.Schedule, er } // Delete takes name of the schedule and deletes it. Returns an error if one occurs. -func (c *schedules) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *schedules) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("schedules"). @@ -149,7 +149,7 @@ func (c *schedules) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *schedules) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *schedules) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("schedules"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/serverstatusrequest.go b/pkg/generated/clientset/versioned/typed/velero/v1/serverstatusrequest.go index 4b892dbd8..dc37f393f 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/serverstatusrequest.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/serverstatusrequest.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type ServerStatusRequestInterface interface { Create(*v1.ServerStatusRequest) (*v1.ServerStatusRequest, error) Update(*v1.ServerStatusRequest) (*v1.ServerStatusRequest, error) UpdateStatus(*v1.ServerStatusRequest) (*v1.ServerStatusRequest, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.ServerStatusRequest, error) - List(opts meta_v1.ListOptions) (*v1.ServerStatusRequestList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.ServerStatusRequest, error) + List(opts metav1.ListOptions) (*v1.ServerStatusRequestList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.ServerStatusRequest, err error) ServerStatusRequestExpansion } @@ -62,7 +62,7 @@ func newServerStatusRequests(c *VeleroV1Client, namespace string) *serverStatusR } // Get takes name of the serverStatusRequest, and returns the corresponding serverStatusRequest object, and an error if there is any. -func (c *serverStatusRequests) Get(name string, options meta_v1.GetOptions) (result *v1.ServerStatusRequest, err error) { +func (c *serverStatusRequests) Get(name string, options metav1.GetOptions) (result *v1.ServerStatusRequest, err error) { result = &v1.ServerStatusRequest{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *serverStatusRequests) Get(name string, options meta_v1.GetOptions) (res } // List takes label and field selectors, and returns the list of ServerStatusRequests that match those selectors. -func (c *serverStatusRequests) List(opts meta_v1.ListOptions) (result *v1.ServerStatusRequestList, err error) { +func (c *serverStatusRequests) List(opts metav1.ListOptions) (result *v1.ServerStatusRequestList, err error) { result = &v1.ServerStatusRequestList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *serverStatusRequests) List(opts meta_v1.ListOptions) (result *v1.Server } // Watch returns a watch.Interface that watches the requested serverStatusRequests. -func (c *serverStatusRequests) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *serverStatusRequests) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *serverStatusRequests) UpdateStatus(serverStatusRequest *v1.ServerStatus } // Delete takes name of the serverStatusRequest and deletes it. Returns an error if one occurs. -func (c *serverStatusRequests) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *serverStatusRequests) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("serverstatusrequests"). @@ -149,7 +149,7 @@ func (c *serverStatusRequests) Delete(name string, options *meta_v1.DeleteOption } // DeleteCollection deletes a collection of objects. -func (c *serverStatusRequests) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *serverStatusRequests) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("serverstatusrequests"). diff --git a/pkg/generated/clientset/versioned/typed/velero/v1/volumesnapshotlocation.go b/pkg/generated/clientset/versioned/typed/velero/v1/volumesnapshotlocation.go index 099f955ff..4a7cd7ac2 100644 --- a/pkg/generated/clientset/versioned/typed/velero/v1/volumesnapshotlocation.go +++ b/pkg/generated/clientset/versioned/typed/velero/v1/volumesnapshotlocation.go @@ -21,7 +21,7 @@ package v1 import ( v1 "github.com/heptio/velero/pkg/apis/velero/v1" scheme "github.com/heptio/velero/pkg/generated/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type VolumeSnapshotLocationInterface interface { Create(*v1.VolumeSnapshotLocation) (*v1.VolumeSnapshotLocation, error) Update(*v1.VolumeSnapshotLocation) (*v1.VolumeSnapshotLocation, error) UpdateStatus(*v1.VolumeSnapshotLocation) (*v1.VolumeSnapshotLocation, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.VolumeSnapshotLocation, error) - List(opts meta_v1.ListOptions) (*v1.VolumeSnapshotLocationList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.VolumeSnapshotLocation, error) + List(opts metav1.ListOptions) (*v1.VolumeSnapshotLocationList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.VolumeSnapshotLocation, err error) VolumeSnapshotLocationExpansion } @@ -62,7 +62,7 @@ func newVolumeSnapshotLocations(c *VeleroV1Client, namespace string) *volumeSnap } // Get takes name of the volumeSnapshotLocation, and returns the corresponding volumeSnapshotLocation object, and an error if there is any. -func (c *volumeSnapshotLocations) Get(name string, options meta_v1.GetOptions) (result *v1.VolumeSnapshotLocation, err error) { +func (c *volumeSnapshotLocations) Get(name string, options metav1.GetOptions) (result *v1.VolumeSnapshotLocation, err error) { result = &v1.VolumeSnapshotLocation{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *volumeSnapshotLocations) Get(name string, options meta_v1.GetOptions) ( } // List takes label and field selectors, and returns the list of VolumeSnapshotLocations that match those selectors. -func (c *volumeSnapshotLocations) List(opts meta_v1.ListOptions) (result *v1.VolumeSnapshotLocationList, err error) { +func (c *volumeSnapshotLocations) List(opts metav1.ListOptions) (result *v1.VolumeSnapshotLocationList, err error) { result = &v1.VolumeSnapshotLocationList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *volumeSnapshotLocations) List(opts meta_v1.ListOptions) (result *v1.Vol } // Watch returns a watch.Interface that watches the requested volumeSnapshotLocations. -func (c *volumeSnapshotLocations) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *volumeSnapshotLocations) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *volumeSnapshotLocations) UpdateStatus(volumeSnapshotLocation *v1.Volume } // Delete takes name of the volumeSnapshotLocation and deletes it. Returns an error if one occurs. -func (c *volumeSnapshotLocations) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *volumeSnapshotLocations) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("volumesnapshotlocations"). @@ -149,7 +149,7 @@ func (c *volumeSnapshotLocations) Delete(name string, options *meta_v1.DeleteOpt } // DeleteCollection deletes a collection of objects. -func (c *volumeSnapshotLocations) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *volumeSnapshotLocations) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("volumesnapshotlocations"). diff --git a/pkg/generated/informers/externalversions/ark/v1/backup.go b/pkg/generated/informers/externalversions/ark/v1/backup.go index b6d94c36b..39ad557e4 100644 --- a/pkg/generated/informers/externalversions/ark/v1/backup.go +++ b/pkg/generated/informers/externalversions/ark/v1/backup.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewBackupInformer(client versioned.Interface, namespace string, resyncPerio func NewFilteredBackupInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().Backups(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().Backups(namespace).Watch(options) }, }, - &ark_v1.Backup{}, + &arkv1.Backup{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *backupInformer) defaultInformer(client versioned.Interface, resyncPerio } func (f *backupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.Backup{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.Backup{}, f.defaultInformer) } func (f *backupInformer) Lister() v1.BackupLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/backupstoragelocation.go b/pkg/generated/informers/externalversions/ark/v1/backupstoragelocation.go index d321f0b7d..cdbeadc00 100644 --- a/pkg/generated/informers/externalversions/ark/v1/backupstoragelocation.go +++ b/pkg/generated/informers/externalversions/ark/v1/backupstoragelocation.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewBackupStorageLocationInformer(client versioned.Interface, namespace stri func NewFilteredBackupStorageLocationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().BackupStorageLocations(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().BackupStorageLocations(namespace).Watch(options) }, }, - &ark_v1.BackupStorageLocation{}, + &arkv1.BackupStorageLocation{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *backupStorageLocationInformer) defaultInformer(client versioned.Interfa } func (f *backupStorageLocationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.BackupStorageLocation{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.BackupStorageLocation{}, f.defaultInformer) } func (f *backupStorageLocationInformer) Lister() v1.BackupStorageLocationLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/deletebackuprequest.go b/pkg/generated/informers/externalversions/ark/v1/deletebackuprequest.go index acb8bb0f4..9d01b607d 100644 --- a/pkg/generated/informers/externalversions/ark/v1/deletebackuprequest.go +++ b/pkg/generated/informers/externalversions/ark/v1/deletebackuprequest.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewDeleteBackupRequestInformer(client versioned.Interface, namespace string func NewFilteredDeleteBackupRequestInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().DeleteBackupRequests(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().DeleteBackupRequests(namespace).Watch(options) }, }, - &ark_v1.DeleteBackupRequest{}, + &arkv1.DeleteBackupRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *deleteBackupRequestInformer) defaultInformer(client versioned.Interface } func (f *deleteBackupRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.DeleteBackupRequest{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.DeleteBackupRequest{}, f.defaultInformer) } func (f *deleteBackupRequestInformer) Lister() v1.DeleteBackupRequestLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/downloadrequest.go b/pkg/generated/informers/externalversions/ark/v1/downloadrequest.go index 02d7f1d23..d341b2f01 100644 --- a/pkg/generated/informers/externalversions/ark/v1/downloadrequest.go +++ b/pkg/generated/informers/externalversions/ark/v1/downloadrequest.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewDownloadRequestInformer(client versioned.Interface, namespace string, re func NewFilteredDownloadRequestInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().DownloadRequests(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().DownloadRequests(namespace).Watch(options) }, }, - &ark_v1.DownloadRequest{}, + &arkv1.DownloadRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *downloadRequestInformer) defaultInformer(client versioned.Interface, re } func (f *downloadRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.DownloadRequest{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.DownloadRequest{}, f.defaultInformer) } func (f *downloadRequestInformer) Lister() v1.DownloadRequestLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/podvolumebackup.go b/pkg/generated/informers/externalversions/ark/v1/podvolumebackup.go index d3c0705d4..65d63b109 100644 --- a/pkg/generated/informers/externalversions/ark/v1/podvolumebackup.go +++ b/pkg/generated/informers/externalversions/ark/v1/podvolumebackup.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewPodVolumeBackupInformer(client versioned.Interface, namespace string, re func NewFilteredPodVolumeBackupInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().PodVolumeBackups(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().PodVolumeBackups(namespace).Watch(options) }, }, - &ark_v1.PodVolumeBackup{}, + &arkv1.PodVolumeBackup{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *podVolumeBackupInformer) defaultInformer(client versioned.Interface, re } func (f *podVolumeBackupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.PodVolumeBackup{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.PodVolumeBackup{}, f.defaultInformer) } func (f *podVolumeBackupInformer) Lister() v1.PodVolumeBackupLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/podvolumerestore.go b/pkg/generated/informers/externalversions/ark/v1/podvolumerestore.go index fb554c6de..0c9b70113 100644 --- a/pkg/generated/informers/externalversions/ark/v1/podvolumerestore.go +++ b/pkg/generated/informers/externalversions/ark/v1/podvolumerestore.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewPodVolumeRestoreInformer(client versioned.Interface, namespace string, r func NewFilteredPodVolumeRestoreInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().PodVolumeRestores(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().PodVolumeRestores(namespace).Watch(options) }, }, - &ark_v1.PodVolumeRestore{}, + &arkv1.PodVolumeRestore{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *podVolumeRestoreInformer) defaultInformer(client versioned.Interface, r } func (f *podVolumeRestoreInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.PodVolumeRestore{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.PodVolumeRestore{}, f.defaultInformer) } func (f *podVolumeRestoreInformer) Lister() v1.PodVolumeRestoreLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/resticrepository.go b/pkg/generated/informers/externalversions/ark/v1/resticrepository.go index 684879105..14f02aaa1 100644 --- a/pkg/generated/informers/externalversions/ark/v1/resticrepository.go +++ b/pkg/generated/informers/externalversions/ark/v1/resticrepository.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewResticRepositoryInformer(client versioned.Interface, namespace string, r func NewFilteredResticRepositoryInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().ResticRepositories(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().ResticRepositories(namespace).Watch(options) }, }, - &ark_v1.ResticRepository{}, + &arkv1.ResticRepository{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *resticRepositoryInformer) defaultInformer(client versioned.Interface, r } func (f *resticRepositoryInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.ResticRepository{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.ResticRepository{}, f.defaultInformer) } func (f *resticRepositoryInformer) Lister() v1.ResticRepositoryLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/restore.go b/pkg/generated/informers/externalversions/ark/v1/restore.go index 27363180c..77cd629fe 100644 --- a/pkg/generated/informers/externalversions/ark/v1/restore.go +++ b/pkg/generated/informers/externalversions/ark/v1/restore.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewRestoreInformer(client versioned.Interface, namespace string, resyncPeri func NewFilteredRestoreInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().Restores(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().Restores(namespace).Watch(options) }, }, - &ark_v1.Restore{}, + &arkv1.Restore{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *restoreInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *restoreInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.Restore{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.Restore{}, f.defaultInformer) } func (f *restoreInformer) Lister() v1.RestoreLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/schedule.go b/pkg/generated/informers/externalversions/ark/v1/schedule.go index edc6b4921..a7a0b2ed0 100644 --- a/pkg/generated/informers/externalversions/ark/v1/schedule.go +++ b/pkg/generated/informers/externalversions/ark/v1/schedule.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewScheduleInformer(client versioned.Interface, namespace string, resyncPer func NewFilteredScheduleInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().Schedules(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().Schedules(namespace).Watch(options) }, }, - &ark_v1.Schedule{}, + &arkv1.Schedule{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *scheduleInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *scheduleInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.Schedule{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.Schedule{}, f.defaultInformer) } func (f *scheduleInformer) Lister() v1.ScheduleLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/serverstatusrequest.go b/pkg/generated/informers/externalversions/ark/v1/serverstatusrequest.go index 025474a42..2c12f7238 100644 --- a/pkg/generated/informers/externalversions/ark/v1/serverstatusrequest.go +++ b/pkg/generated/informers/externalversions/ark/v1/serverstatusrequest.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewServerStatusRequestInformer(client versioned.Interface, namespace string func NewFilteredServerStatusRequestInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().ServerStatusRequests(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().ServerStatusRequests(namespace).Watch(options) }, }, - &ark_v1.ServerStatusRequest{}, + &arkv1.ServerStatusRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *serverStatusRequestInformer) defaultInformer(client versioned.Interface } func (f *serverStatusRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.ServerStatusRequest{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.ServerStatusRequest{}, f.defaultInformer) } func (f *serverStatusRequestInformer) Lister() v1.ServerStatusRequestLister { diff --git a/pkg/generated/informers/externalversions/ark/v1/volumesnapshotlocation.go b/pkg/generated/informers/externalversions/ark/v1/volumesnapshotlocation.go index c800736a9..287f84a62 100644 --- a/pkg/generated/informers/externalversions/ark/v1/volumesnapshotlocation.go +++ b/pkg/generated/informers/externalversions/ark/v1/volumesnapshotlocation.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - ark_v1 "github.com/heptio/velero/pkg/apis/ark/v1" + arkv1 "github.com/heptio/velero/pkg/apis/ark/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/ark/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewVolumeSnapshotLocationInformer(client versioned.Interface, namespace str func NewFilteredVolumeSnapshotLocationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().VolumeSnapshotLocations(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.ArkV1().VolumeSnapshotLocations(namespace).Watch(options) }, }, - &ark_v1.VolumeSnapshotLocation{}, + &arkv1.VolumeSnapshotLocation{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *volumeSnapshotLocationInformer) defaultInformer(client versioned.Interf } func (f *volumeSnapshotLocationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&ark_v1.VolumeSnapshotLocation{}, f.defaultInformer) + return f.factory.InformerFor(&arkv1.VolumeSnapshotLocation{}, f.defaultInformer) } func (f *volumeSnapshotLocationInformer) Lister() v1.VolumeSnapshotLocationLister { diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index d4d836d7d..e88e87a3e 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -22,7 +22,7 @@ import ( "fmt" v1 "github.com/heptio/velero/pkg/apis/ark/v1" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) @@ -78,27 +78,27 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource return &genericInformer{resource: resource.GroupResource(), informer: f.Ark().V1().VolumeSnapshotLocations().Informer()}, nil // Group=velero.io, Version=v1 - case velero_v1.SchemeGroupVersion.WithResource("backups"): + case velerov1.SchemeGroupVersion.WithResource("backups"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().Backups().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("backupstoragelocations"): + case velerov1.SchemeGroupVersion.WithResource("backupstoragelocations"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().BackupStorageLocations().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("deletebackuprequests"): + case velerov1.SchemeGroupVersion.WithResource("deletebackuprequests"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().DeleteBackupRequests().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("downloadrequests"): + case velerov1.SchemeGroupVersion.WithResource("downloadrequests"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().DownloadRequests().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("podvolumebackups"): + case velerov1.SchemeGroupVersion.WithResource("podvolumebackups"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().PodVolumeBackups().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("podvolumerestores"): + case velerov1.SchemeGroupVersion.WithResource("podvolumerestores"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().PodVolumeRestores().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("resticrepositories"): + case velerov1.SchemeGroupVersion.WithResource("resticrepositories"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().ResticRepositories().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("restores"): + case velerov1.SchemeGroupVersion.WithResource("restores"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().Restores().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("schedules"): + case velerov1.SchemeGroupVersion.WithResource("schedules"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().Schedules().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("serverstatusrequests"): + case velerov1.SchemeGroupVersion.WithResource("serverstatusrequests"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().ServerStatusRequests().Informer()}, nil - case velero_v1.SchemeGroupVersion.WithResource("volumesnapshotlocations"): + case velerov1.SchemeGroupVersion.WithResource("volumesnapshotlocations"): return &genericInformer{resource: resource.GroupResource(), informer: f.Velero().V1().VolumeSnapshotLocations().Informer()}, nil } diff --git a/pkg/generated/informers/externalversions/velero/v1/backup.go b/pkg/generated/informers/externalversions/velero/v1/backup.go index 380328265..a814aea12 100644 --- a/pkg/generated/informers/externalversions/velero/v1/backup.go +++ b/pkg/generated/informers/externalversions/velero/v1/backup.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewBackupInformer(client versioned.Interface, namespace string, resyncPerio func NewFilteredBackupInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().Backups(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().Backups(namespace).Watch(options) }, }, - &velero_v1.Backup{}, + &velerov1.Backup{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *backupInformer) defaultInformer(client versioned.Interface, resyncPerio } func (f *backupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.Backup{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.Backup{}, f.defaultInformer) } func (f *backupInformer) Lister() v1.BackupLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/backupstoragelocation.go b/pkg/generated/informers/externalversions/velero/v1/backupstoragelocation.go index e7529d3f8..14e68413b 100644 --- a/pkg/generated/informers/externalversions/velero/v1/backupstoragelocation.go +++ b/pkg/generated/informers/externalversions/velero/v1/backupstoragelocation.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewBackupStorageLocationInformer(client versioned.Interface, namespace stri func NewFilteredBackupStorageLocationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().BackupStorageLocations(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().BackupStorageLocations(namespace).Watch(options) }, }, - &velero_v1.BackupStorageLocation{}, + &velerov1.BackupStorageLocation{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *backupStorageLocationInformer) defaultInformer(client versioned.Interfa } func (f *backupStorageLocationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.BackupStorageLocation{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.BackupStorageLocation{}, f.defaultInformer) } func (f *backupStorageLocationInformer) Lister() v1.BackupStorageLocationLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/deletebackuprequest.go b/pkg/generated/informers/externalversions/velero/v1/deletebackuprequest.go index 15c47d061..7ce29c982 100644 --- a/pkg/generated/informers/externalversions/velero/v1/deletebackuprequest.go +++ b/pkg/generated/informers/externalversions/velero/v1/deletebackuprequest.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewDeleteBackupRequestInformer(client versioned.Interface, namespace string func NewFilteredDeleteBackupRequestInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().DeleteBackupRequests(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().DeleteBackupRequests(namespace).Watch(options) }, }, - &velero_v1.DeleteBackupRequest{}, + &velerov1.DeleteBackupRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *deleteBackupRequestInformer) defaultInformer(client versioned.Interface } func (f *deleteBackupRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.DeleteBackupRequest{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.DeleteBackupRequest{}, f.defaultInformer) } func (f *deleteBackupRequestInformer) Lister() v1.DeleteBackupRequestLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/downloadrequest.go b/pkg/generated/informers/externalversions/velero/v1/downloadrequest.go index 9777622a9..6964fd823 100644 --- a/pkg/generated/informers/externalversions/velero/v1/downloadrequest.go +++ b/pkg/generated/informers/externalversions/velero/v1/downloadrequest.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewDownloadRequestInformer(client versioned.Interface, namespace string, re func NewFilteredDownloadRequestInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().DownloadRequests(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().DownloadRequests(namespace).Watch(options) }, }, - &velero_v1.DownloadRequest{}, + &velerov1.DownloadRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *downloadRequestInformer) defaultInformer(client versioned.Interface, re } func (f *downloadRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.DownloadRequest{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.DownloadRequest{}, f.defaultInformer) } func (f *downloadRequestInformer) Lister() v1.DownloadRequestLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/podvolumebackup.go b/pkg/generated/informers/externalversions/velero/v1/podvolumebackup.go index 77d79e5dc..099b2ace9 100644 --- a/pkg/generated/informers/externalversions/velero/v1/podvolumebackup.go +++ b/pkg/generated/informers/externalversions/velero/v1/podvolumebackup.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewPodVolumeBackupInformer(client versioned.Interface, namespace string, re func NewFilteredPodVolumeBackupInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().PodVolumeBackups(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().PodVolumeBackups(namespace).Watch(options) }, }, - &velero_v1.PodVolumeBackup{}, + &velerov1.PodVolumeBackup{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *podVolumeBackupInformer) defaultInformer(client versioned.Interface, re } func (f *podVolumeBackupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.PodVolumeBackup{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.PodVolumeBackup{}, f.defaultInformer) } func (f *podVolumeBackupInformer) Lister() v1.PodVolumeBackupLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/podvolumerestore.go b/pkg/generated/informers/externalversions/velero/v1/podvolumerestore.go index 48b77852f..69b7aba78 100644 --- a/pkg/generated/informers/externalversions/velero/v1/podvolumerestore.go +++ b/pkg/generated/informers/externalversions/velero/v1/podvolumerestore.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewPodVolumeRestoreInformer(client versioned.Interface, namespace string, r func NewFilteredPodVolumeRestoreInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().PodVolumeRestores(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().PodVolumeRestores(namespace).Watch(options) }, }, - &velero_v1.PodVolumeRestore{}, + &velerov1.PodVolumeRestore{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *podVolumeRestoreInformer) defaultInformer(client versioned.Interface, r } func (f *podVolumeRestoreInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.PodVolumeRestore{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.PodVolumeRestore{}, f.defaultInformer) } func (f *podVolumeRestoreInformer) Lister() v1.PodVolumeRestoreLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/resticrepository.go b/pkg/generated/informers/externalversions/velero/v1/resticrepository.go index 524cbd66d..0410d36a0 100644 --- a/pkg/generated/informers/externalversions/velero/v1/resticrepository.go +++ b/pkg/generated/informers/externalversions/velero/v1/resticrepository.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewResticRepositoryInformer(client versioned.Interface, namespace string, r func NewFilteredResticRepositoryInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().ResticRepositories(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().ResticRepositories(namespace).Watch(options) }, }, - &velero_v1.ResticRepository{}, + &velerov1.ResticRepository{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *resticRepositoryInformer) defaultInformer(client versioned.Interface, r } func (f *resticRepositoryInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.ResticRepository{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.ResticRepository{}, f.defaultInformer) } func (f *resticRepositoryInformer) Lister() v1.ResticRepositoryLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/restore.go b/pkg/generated/informers/externalversions/velero/v1/restore.go index 5f614a131..3bca0f9df 100644 --- a/pkg/generated/informers/externalversions/velero/v1/restore.go +++ b/pkg/generated/informers/externalversions/velero/v1/restore.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewRestoreInformer(client versioned.Interface, namespace string, resyncPeri func NewFilteredRestoreInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().Restores(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().Restores(namespace).Watch(options) }, }, - &velero_v1.Restore{}, + &velerov1.Restore{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *restoreInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *restoreInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.Restore{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.Restore{}, f.defaultInformer) } func (f *restoreInformer) Lister() v1.RestoreLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/schedule.go b/pkg/generated/informers/externalversions/velero/v1/schedule.go index 8f898586b..d6773239d 100644 --- a/pkg/generated/informers/externalversions/velero/v1/schedule.go +++ b/pkg/generated/informers/externalversions/velero/v1/schedule.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewScheduleInformer(client versioned.Interface, namespace string, resyncPer func NewFilteredScheduleInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().Schedules(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().Schedules(namespace).Watch(options) }, }, - &velero_v1.Schedule{}, + &velerov1.Schedule{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *scheduleInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *scheduleInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.Schedule{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.Schedule{}, f.defaultInformer) } func (f *scheduleInformer) Lister() v1.ScheduleLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/serverstatusrequest.go b/pkg/generated/informers/externalversions/velero/v1/serverstatusrequest.go index a4d765110..13cf378d1 100644 --- a/pkg/generated/informers/externalversions/velero/v1/serverstatusrequest.go +++ b/pkg/generated/informers/externalversions/velero/v1/serverstatusrequest.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewServerStatusRequestInformer(client versioned.Interface, namespace string func NewFilteredServerStatusRequestInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().ServerStatusRequests(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().ServerStatusRequests(namespace).Watch(options) }, }, - &velero_v1.ServerStatusRequest{}, + &velerov1.ServerStatusRequest{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *serverStatusRequestInformer) defaultInformer(client versioned.Interface } func (f *serverStatusRequestInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.ServerStatusRequest{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.ServerStatusRequest{}, f.defaultInformer) } func (f *serverStatusRequestInformer) Lister() v1.ServerStatusRequestLister { diff --git a/pkg/generated/informers/externalversions/velero/v1/volumesnapshotlocation.go b/pkg/generated/informers/externalversions/velero/v1/volumesnapshotlocation.go index 842e467a1..bd7f1434f 100644 --- a/pkg/generated/informers/externalversions/velero/v1/volumesnapshotlocation.go +++ b/pkg/generated/informers/externalversions/velero/v1/volumesnapshotlocation.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - velero_v1 "github.com/heptio/velero/pkg/apis/velero/v1" + velerov1 "github.com/heptio/velero/pkg/apis/velero/v1" versioned "github.com/heptio/velero/pkg/generated/clientset/versioned" internalinterfaces "github.com/heptio/velero/pkg/generated/informers/externalversions/internalinterfaces" v1 "github.com/heptio/velero/pkg/generated/listers/velero/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewVolumeSnapshotLocationInformer(client versioned.Interface, namespace str func NewFilteredVolumeSnapshotLocationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().VolumeSnapshotLocations(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.VeleroV1().VolumeSnapshotLocations(namespace).Watch(options) }, }, - &velero_v1.VolumeSnapshotLocation{}, + &velerov1.VolumeSnapshotLocation{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *volumeSnapshotLocationInformer) defaultInformer(client versioned.Interf } func (f *volumeSnapshotLocationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&velero_v1.VolumeSnapshotLocation{}, f.defaultInformer) + return f.factory.InformerFor(&velerov1.VolumeSnapshotLocation{}, f.defaultInformer) } func (f *volumeSnapshotLocationInformer) Lister() v1.VolumeSnapshotLocationLister {