Skip to content
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.

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

Already on GitHub? Sign in to your account

馃尡 fix testdata / merge conflict #3302

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion hack/docs/internal/generate_component_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func (sp *Sample) GenerateSampleProject() {
"--owner", "The Kubernetes authors",
"--plugins=go/v4",
"--component-config",
"--plugins=go/v3",
)
CheckError("Initializing the project", err)

Expand Down
2 changes: 1 addition & 1 deletion test/testdata/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ build_kb
scaffold_test_project project-v2 --project-version=2

# [Deprecated] - Project version 3 (default) uses plugin go/v3 (default).
scaffold_test_project project-v3
scaffold_test_project project-v3 --plugins="go/v3"

# [Currently, default CLI plugin] - [Next version, alpha] Project version v4-alpha
scaffold_test_project project-v4 --plugins="go/v4"
Expand Down