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

Merge branch 'main' into windows_e2e

pull/8933/head
Xun Jiang/Bruce Jiang 2025-05-21 10:23:47 +08:00 committed by GitHub
parent a18fe55585 0132d1127e
commit ef79887262
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/util/velero/install.go
View File

@ -455,6 +455,26 @@ func createVeleroResources(ctx context.Context, cli, namespace string, args []st
return errors.Wrapf(err, "failed to wait the CRDs be ready") return errors.Wrapf(err, "failed to wait the CRDs be ready")
} }
// Wait the Velero CRD API endpoint is ready
wait.PollUntilContextTimeout(ctx, k8s.PollInterval, time.Minute, true, func(ctx context.Context) (bool, error) {
v1VerifyCmd := exec.CommandContext(ctx, "kubectl", "get", "--raw", "/apis/velero.io/v1")
v1VerifyCmd.Stdout = os.Stdout
v1VerifyCmd.Stderr = os.Stderr
if err := v1VerifyCmd.Run(); err != nil {
fmt.Printf("/apis/velero.io/v1 is not ready: %s.\n", err.Error())
return false, nil
}
v2alpha1VerifyCmd := exec.CommandContext(ctx, "kubectl", "get", "--raw", "/apis/velero.io/v2alpha1")
v2alpha1VerifyCmd.Stdout = os.Stdout
v2alpha1VerifyCmd.Stderr = os.Stderr
if err := v2alpha1VerifyCmd.Run(); err != nil {
fmt.Printf("/apis/velero.io/v2alpha1 is not ready: %s.\n", err.Error())
return false, nil
}
return true, nil
})
// remove the "--crds-only" option from the args // remove the "--crds-only" option from the args
args = args[:len(args)-1] args = args[:len(args)-1]
cmd = exec.CommandContext(ctx, cli, args...) cmd = exec.CommandContext(ctx, cli, args...)