Skip to content

OADP CLI check - do not attempt to connect to server #1904

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

Open
wants to merge 1 commit into
base: oadp-dev
Choose a base branch
from
+1 −1
Open

OADP CLI check - do not attempt to connect to server #1904

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
2 changes: 1 addition & 1 deletion tests/e2e/backup_restore_cli_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ var _ = ginkgo.Describe("Backup and restore tests via OADP CLI", ginkgo.Label("c
ginkgo.BeforeAll(func() {
// Verify OADP CLI is available (should be installed in Docker image)
log.Print("Verifying OADP CLI is available...")
cmd := exec.Command("kubectl", "oadp", "version")
cmd := exec.Command("kubectl", "oadp", "version", "--client-only")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's how currently oadp client is implemented but IMO the flag should be --client to match what is in the kubectl:

https://kubernetes.io/docs/reference/kubectl/#operations

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's more a parallel to how velero CLI is doing, not exactly kubectl

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think keep it same as velero CLI, and propose velero CLI upstream match kubectl in the future.

output, err := cmd.CombinedOutput()
if err != nil {
ginkgo.Fail(fmt.Sprintf("OADP CLI not available: %v, output: %s", err, string(output)))
Expand Down