From d2fc9fa1a9e3cddc932c76e1e47eb4e949285822 Mon Sep 17 00:00:00 2001 From: danfengl Date: Fri, 20 Oct 2023 01:50:24 +0000 Subject: [PATCH] Fix fail to get backup repo due to missing api group name issue Signed-off-by: danfengl --- test/util/velero/velero_utils.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/util/velero/velero_utils.go b/test/util/velero/velero_utils.go index f256aa6f1..a106cf5b5 100644 --- a/test/util/velero/velero_utils.go +++ b/test/util/velero/velero_utils.go @@ -35,11 +35,9 @@ import ( "github.com/pkg/errors" "golang.org/x/exp/slices" - "k8s.io/apimachinery/pkg/util/wait" - - kbclient "sigs.k8s.io/controller-runtime/pkg/client" - ver "k8s.io/apimachinery/pkg/util/version" + "k8s.io/apimachinery/pkg/util/wait" + kbclient "sigs.k8s.io/controller-runtime/pkg/client" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" cliinstall "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" @@ -1161,7 +1159,7 @@ func SnapshotCRsCountShouldBe(ctx context.Context, namespace, backupName string, } func BackupRepositoriesCountShouldBe(ctx context.Context, veleroNamespace, targetNamespace string, expectedCount int) error { - resticArr, err := GetResticRepositories(ctx, veleroNamespace, targetNamespace) + resticArr, err := GetRepositories(ctx, veleroNamespace, targetNamespace) if err != nil { return errors.Wrapf(err, "Fail to get BackupRepositories") } @@ -1172,11 +1170,11 @@ func BackupRepositoriesCountShouldBe(ctx context.Context, veleroNamespace, targe } } -func GetResticRepositories(ctx context.Context, veleroNamespace, targetNamespace string) ([]string, error) { +func GetRepositories(ctx context.Context, veleroNamespace, targetNamespace string) ([]string, error) { cmds := []*common.OsCommandLine{} cmd := &common.OsCommandLine{ Cmd: "kubectl", - Args: []string{"get", "-n", veleroNamespace, "BackupRepositories"}, + Args: []string{"get", "-n", veleroNamespace, "backuprepositories.velero.io"}, } cmds = append(cmds, cmd)