diff --git a/pkg/backup/pod_command_executor.go b/pkg/backup/pod_command_executor.go index 5cccdbced..4d421a254 100644 --- a/pkg/backup/pod_command_executor.go +++ b/pkg/backup/pod_command_executor.go @@ -25,9 +25,9 @@ import ( "github.com/heptio/ark/pkg/util/collections" "github.com/pkg/errors" "github.com/sirupsen/logrus" + kapiv1 "k8s.io/api/core/v1" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" kscheme "k8s.io/client-go/kubernetes/scheme" - kapiv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" ) diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index fa10e00b5..f02690f3b 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -32,6 +32,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/oauth2/google" + "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" @@ -40,7 +41,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" kcorev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" diff --git a/pkg/cmd/util/output/output.go b/pkg/cmd/util/output/output.go index fc6a917bb..f956cd136 100644 --- a/pkg/cmd/util/output/output.go +++ b/pkg/cmd/util/output/output.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/api" "k8s.io/kubernetes/pkg/printers" + "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/util/encode" @@ -168,7 +168,7 @@ func NewPrinter(cmd *cobra.Command) (*printers.HumanReadablePrinter, error) { printer := printers.NewHumanReadablePrinter( encoder, - scheme.Codecs.UniversalDecoder(api.SchemeGroupVersion), + scheme.Codecs.UniversalDecoder(v1.SchemeGroupVersion), options, ) diff --git a/pkg/discovery/helper.go b/pkg/discovery/helper.go index 4d255f4cf..497b9baa2 100644 --- a/pkg/discovery/helper.go +++ b/pkg/discovery/helper.go @@ -29,7 +29,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" - "k8s.io/client-go/pkg/api" ) // Helper exposes functions for interacting with the Kubernetes discovery @@ -110,9 +109,6 @@ func (h *helper) Refresh() error { h.resources = discovery.FilteredBy( discovery.ResourcePredicateFunc(func(groupVersion string, r *metav1.APIResource) bool { - if groupVersion == api.SchemeGroupVersion.String() { - return false - } return discovery.SupportsAllVerbs{Verbs: []string{"list", "create"}}.Match(groupVersion, r) }), preferredResources, diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index cad0c2d89..dc73734db 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -29,6 +29,7 @@ import ( "github.com/sirupsen/logrus" + "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -36,7 +37,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/client" diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go index 6596a99e2..bfb54d5c3 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -28,13 +28,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" api "github.com/heptio/ark/pkg/apis/ark/v1" "github.com/heptio/ark/pkg/restore/restorers" diff --git a/pkg/util/kube/utils.go b/pkg/util/kube/utils.go index 74ad9120b..ee72dbcff 100644 --- a/pkg/util/kube/utils.go +++ b/pkg/util/kube/utils.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" + "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" "github.com/heptio/ark/pkg/util/collections" )