Merge pull request #3302 from camilamacedo86/fix-merge-testdat

🌱 fix testdata / merge conflict
kubernetes-sigs · Mar 17, 2023 · f5af84e · f5af84e
2 parents 9c3e643 + 28a158c
commit f5af84e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/hack/docs/internal/generate_component_config.go b/hack/docs/internal/generate_component_config.go
@@ -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)
 

diff --git a/test/testdata/generate.sh b/test/testdata/generate.sh
@@ -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"