diff --git a/pkg/client/factory.go b/pkg/client/factory.go index d01106b5b..0726de883 100644 --- a/pkg/client/factory.go +++ b/pkg/client/factory.go @@ -20,7 +20,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/pflag" - "github.com/heptio/ark/pkg/generated/clientset" + clientset "github.com/heptio/ark/pkg/generated/clientset/versioned" ) // Factory knows how to create an ArkClient. diff --git a/pkg/cloudprovider/backup_service.go b/pkg/cloudprovider/backup_service.go index 1925cff1b..545c9fa96 100644 --- a/pkg/cloudprovider/backup_service.go +++ b/pkg/cloudprovider/backup_service.go @@ -31,7 +31,7 @@ import ( kerrors "k8s.io/apimachinery/pkg/util/errors" api "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/scheme" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" ) // BackupService contains methods for working with backups in object storage. diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index f02690f3b..dcfc981cb 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -55,8 +55,8 @@ import ( "github.com/heptio/ark/pkg/cmd/util/flag" "github.com/heptio/ark/pkg/controller" arkdiscovery "github.com/heptio/ark/pkg/discovery" - "github.com/heptio/ark/pkg/generated/clientset" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + clientset "github.com/heptio/ark/pkg/generated/clientset/versioned" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" informers "github.com/heptio/ark/pkg/generated/informers/externalversions" "github.com/heptio/ark/pkg/restore" "github.com/heptio/ark/pkg/restore/restorers" diff --git a/pkg/cmd/util/downloadrequest/downloadrequest.go b/pkg/cmd/util/downloadrequest/downloadrequest.go index 3df068d90..adbf3b02f 100644 --- a/pkg/cmd/util/downloadrequest/downloadrequest.go +++ b/pkg/cmd/util/downloadrequest/downloadrequest.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "github.com/heptio/ark/pkg/apis/ark/v1" - arkclientv1 "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + arkclientv1 "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" ) func Stream(client arkclientv1.DownloadRequestsGetter, name string, kind v1.DownloadTargetKind, w io.Writer, timeout time.Duration) error { diff --git a/pkg/cmd/util/downloadrequest/downloadrequest_test.go b/pkg/cmd/util/downloadrequest/downloadrequest_test.go index 3b89617a1..75a194ce7 100644 --- a/pkg/cmd/util/downloadrequest/downloadrequest_test.go +++ b/pkg/cmd/util/downloadrequest/downloadrequest_test.go @@ -27,7 +27,7 @@ import ( "time" "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/cmd/util/output/output.go b/pkg/cmd/util/output/output.go index f956cd136..bb2f5a417 100644 --- a/pkg/cmd/util/output/output.go +++ b/pkg/cmd/util/output/output.go @@ -30,7 +30,7 @@ import ( "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/cmd/util/flag" - "github.com/heptio/ark/pkg/generated/clientset/scheme" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" "github.com/heptio/ark/pkg/util/encode" ) diff --git a/pkg/controller/backup_controller.go b/pkg/controller/backup_controller.go index ff61016d5..1d54b27e8 100644 --- a/pkg/controller/backup_controller.go +++ b/pkg/controller/backup_controller.go @@ -38,8 +38,8 @@ import ( api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/backup" "github.com/heptio/ark/pkg/cloudprovider" - "github.com/heptio/ark/pkg/generated/clientset/scheme" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1" listers "github.com/heptio/ark/pkg/generated/listers/ark/v1" "github.com/heptio/ark/pkg/util/collections" diff --git a/pkg/controller/backup_controller_test.go b/pkg/controller/backup_controller_test.go index ae45fe727..286f65b7e 100644 --- a/pkg/controller/backup_controller_test.go +++ b/pkg/controller/backup_controller_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/require" "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/fake" - "github.com/heptio/ark/pkg/generated/clientset/scheme" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" informers "github.com/heptio/ark/pkg/generated/informers/externalversions" . "github.com/heptio/ark/pkg/util/test" ) diff --git a/pkg/controller/backup_sync_controller.go b/pkg/controller/backup_sync_controller.go index 7f193196e..978c2e311 100644 --- a/pkg/controller/backup_sync_controller.go +++ b/pkg/controller/backup_sync_controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "github.com/heptio/ark/pkg/cloudprovider" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" "github.com/heptio/ark/pkg/util/kube" ) diff --git a/pkg/controller/backup_sync_controller_test.go b/pkg/controller/backup_sync_controller_test.go index c956ca0af..47aa18b76 100644 --- a/pkg/controller/backup_sync_controller_test.go +++ b/pkg/controller/backup_sync_controller_test.go @@ -27,7 +27,7 @@ import ( core "k8s.io/client-go/testing" "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" . "github.com/heptio/ark/pkg/util/test" ) diff --git a/pkg/controller/download_request_controller.go b/pkg/controller/download_request_controller.go index be553c7cb..001559450 100644 --- a/pkg/controller/download_request_controller.go +++ b/pkg/controller/download_request_controller.go @@ -34,8 +34,8 @@ import ( "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/cloudprovider" - "github.com/heptio/ark/pkg/generated/clientset/scheme" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1" listers "github.com/heptio/ark/pkg/generated/listers/ark/v1" "github.com/heptio/ark/pkg/util/kube" diff --git a/pkg/controller/download_request_controller_test.go b/pkg/controller/download_request_controller_test.go index 6c2c96123..a4738fb07 100644 --- a/pkg/controller/download_request_controller_test.go +++ b/pkg/controller/download_request_controller_test.go @@ -29,7 +29,7 @@ import ( core "k8s.io/client-go/testing" "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/ark/pkg/generated/informers/externalversions" "github.com/heptio/ark/pkg/util/test" ) diff --git a/pkg/controller/gc_controller.go b/pkg/controller/gc_controller.go index f4e8dfd41..cd35398ea 100644 --- a/pkg/controller/gc_controller.go +++ b/pkg/controller/gc_controller.go @@ -31,7 +31,7 @@ import ( api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/cloudprovider" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1" listers "github.com/heptio/ark/pkg/generated/listers/ark/v1" "github.com/heptio/ark/pkg/util/kube" diff --git a/pkg/controller/gc_controller_test.go b/pkg/controller/gc_controller_test.go index b5109e09b..5e9d25d67 100644 --- a/pkg/controller/gc_controller_test.go +++ b/pkg/controller/gc_controller_test.go @@ -29,7 +29,7 @@ import ( api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/cloudprovider" - "github.com/heptio/ark/pkg/generated/clientset/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/ark/pkg/generated/informers/externalversions" . "github.com/heptio/ark/pkg/util/test" ) diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go index 2d6802296..7ef808c53 100644 --- a/pkg/controller/restore_controller.go +++ b/pkg/controller/restore_controller.go @@ -36,8 +36,8 @@ import ( api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/cloudprovider" - "github.com/heptio/ark/pkg/generated/clientset/scheme" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1" listers "github.com/heptio/ark/pkg/generated/listers/ark/v1" "github.com/heptio/ark/pkg/restore" diff --git a/pkg/controller/restore_controller_test.go b/pkg/controller/restore_controller_test.go index 352fbeaf8..73f78b702 100644 --- a/pkg/controller/restore_controller_test.go +++ b/pkg/controller/restore_controller_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/tools/cache" api "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/ark/pkg/generated/informers/externalversions" . "github.com/heptio/ark/pkg/util/test" ) diff --git a/pkg/controller/schedule_controller.go b/pkg/controller/schedule_controller.go index 5d44d0644..682de66a1 100644 --- a/pkg/controller/schedule_controller.go +++ b/pkg/controller/schedule_controller.go @@ -35,8 +35,8 @@ import ( "k8s.io/client-go/util/workqueue" api "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/scheme" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1" listers "github.com/heptio/ark/pkg/generated/listers/ark/v1" kubeutil "github.com/heptio/ark/pkg/util/kube" diff --git a/pkg/controller/schedule_controller_test.go b/pkg/controller/schedule_controller_test.go index b63af3422..aee3e09cd 100644 --- a/pkg/controller/schedule_controller_test.go +++ b/pkg/controller/schedule_controller_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/tools/cache" api "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/fake" + "github.com/heptio/ark/pkg/generated/clientset/versioned/fake" informers "github.com/heptio/ark/pkg/generated/informers/externalversions" . "github.com/heptio/ark/pkg/util/test" ) diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index dc73734db..a648561b3 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -42,7 +42,7 @@ import ( "github.com/heptio/ark/pkg/client" "github.com/heptio/ark/pkg/cloudprovider" "github.com/heptio/ark/pkg/discovery" - arkv1client "github.com/heptio/ark/pkg/generated/clientset/typed/ark/v1" + arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1" "github.com/heptio/ark/pkg/restore/restorers" "github.com/heptio/ark/pkg/util/collections" "github.com/heptio/ark/pkg/util/kube" diff --git a/pkg/util/encode/encode.go b/pkg/util/encode/encode.go index 1e95e9b43..3a0f8d289 100644 --- a/pkg/util/encode/encode.go +++ b/pkg/util/encode/encode.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "github.com/heptio/ark/pkg/apis/ark/v1" - "github.com/heptio/ark/pkg/generated/clientset/scheme" + "github.com/heptio/ark/pkg/generated/clientset/versioned/scheme" ) // Encode converts the provided object to the specified format