vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6983 from danfengliu/fix-resource-groupname-issue 

Fix fail to get backup repo due to missing api group name issue
pull/6923/head
lyndon 2023-10-24 15:26:55 +08:00 committed by GitHub
parent 27f301cb89 d2fc9fa1a9
commit e2ec855c4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/util/velero/velero_utils.go
View File

@ -35,11 +35,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/exp/slices" "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" 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" velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
cliinstall "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" 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 { 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 { if err != nil {
return errors.Wrapf(err, "Fail to get BackupRepositories") 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{} cmds := []*common.OsCommandLine{}
cmd := &common.OsCommandLine{ cmd := &common.OsCommandLine{
Cmd: "kubectl", Cmd: "kubectl",
Args: []string{"get", "-n", veleroNamespace, "BackupRepositories"}, Args: []string{"get", "-n", veleroNamespace, "backuprepositories.velero.io"},
} }
cmds = append(cmds, cmd) cmds = append(cmds, cmd)