Skip to content

Add velero.io APIs availability check in Velero E2E install function. #8942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reasonerjt merged 1 commit into from
May 19, 2025
Merged

Add velero.io APIs availability check in Velero E2E install function. #8942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion test/util/velero/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func VeleroInstall(ctx context.Context, veleroCfg *test.VeleroConfig, isStandbyC
WithoutDisableInformerCacheParam: veleroCfg.WithoutDisableInformerCacheParam,
},
); err != nil {
time.Sleep(9 * time.Hour)
time.Sleep(1 * time.Minute)
RunDebug(context.Background(), veleroCfg.VeleroCLI, veleroCfg.VeleroNamespace, "", "")
return errors.WithMessagef(err, "Failed to install Velero in the cluster")
}
Expand Down Expand Up @@ -433,6 +433,26 @@ func createVeleroResources(ctx context.Context, cli, namespace string, args []st
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
args = args[:len(args)-1]
cmd = exec.CommandContext(ctx, cli, args...)
Expand Down
Loading