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

k8s-ci-robot · web-flow · commit f5af84e805f0 · 2023-03-17T13:49:16.000-07:00
🌱 fix testdata / merge conflict
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"

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ func (sp *Sample) GenerateSampleProject() {`
`74`	`74`	`"--owner", "The Kubernetes authors",`
`75`	`75`	`"--plugins=go/v4",`
`76`	`76`	`"--component-config",`
`77`		`- "--plugins=go/v3",`
`78`	`77`	`)`
`79`	`78`	`CheckError("Initializing the project", err)`
`80`	`79`