From 3923d382fd7461f4c3dd811a7f4df5b4c95ef1f1 Mon Sep 17 00:00:00 2001 From: Anshul Ahuja Date: Thu, 6 Jul 2023 10:44:33 +0530 Subject: [PATCH] Fix CI Signed-off-by: Anshul Ahuja --- internal/resourcemodifiers/resource_modifiers.go | 3 ++- pkg/cmd/cli/restore/create.go | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/resourcemodifiers/resource_modifiers.go b/internal/resourcemodifiers/resource_modifiers.go index 37c41dd99..24bb72eb8 100644 --- a/internal/resourcemodifiers/resource_modifiers.go +++ b/internal/resourcemodifiers/resource_modifiers.go @@ -9,10 +9,11 @@ import ( jsonpatch "github.com/evanphx/json-patch" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/vmware-tanzu/velero/pkg/util/collections" "gopkg.in/yaml.v3" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + + "github.com/vmware-tanzu/velero/pkg/util/collections" ) const ( diff --git a/pkg/cmd/cli/restore/create.go b/pkg/cmd/cli/restore/create.go index 8adf297da..16cfe6825 100644 --- a/pkg/cmd/cli/restore/create.go +++ b/pkg/cmd/cli/restore/create.go @@ -25,6 +25,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/tools/cache" + "github.com/vmware-tanzu/velero/internal/resourcemodifiers" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "github.com/vmware-tanzu/velero/pkg/client" @@ -34,9 +38,6 @@ import ( veleroclient "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned" v1 "github.com/vmware-tanzu/velero/pkg/generated/informers/externalversions/velero/v1" "github.com/vmware-tanzu/velero/pkg/util/boolptr" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/tools/cache" ) func NewCreateCommand(f client.Factory, use string) *cobra.Command {