chore: update invocation syntax for new controller-tools

justinsb · justinsb · commit 1afc74e190fe · 2024-03-28T19:25:51.000-04:00
Specifying object multiple times is now an error.

Signed-off-by: justinsb &lt;justinsb@google.com&gt;
diff --git a/pkg/api/kptfile/v1/types.go b/pkg/api/kptfile/v1/types.go
@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../porch/scripts/boilerplate.go.txt"
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../porch/scripts/boilerplate.go.txt"
 
 const (
 	KptFileName = "Kptfile"
diff --git a/porch/api/porchconfig/v1alpha1/groupversion_info.go b/porch/api/porchconfig/v1alpha1/groupversion_info.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/fleetsyncs/api/v1alpha1/groupversion_info.go b/porch/controllers/fleetsyncs/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/packagevariants/api/v1alpha1/groupversion_info.go b/porch/controllers/packagevariants/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/packagevariantsets/api/v1alpha1/groupversion_info.go b/porch/controllers/packagevariantsets/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/packagevariantsets/api/v1alpha2/groupversion_info.go b/porch/controllers/packagevariantsets/api/v1alpha2/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/remoterootsyncsets/api/v1alpha1/groupversion_info.go b/porch/controllers/remoterootsyncsets/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/rootsyncdeployments/api/v1alpha1/groupversion_info.go b/porch/controllers/rootsyncdeployments/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/rootsyncrollouts/api/v1alpha1/groupversion_info.go b/porch/controllers/rootsyncrollouts/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/rootsyncsets/api/v1alpha1/groupversion_info.go b/porch/controllers/rootsyncsets/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/controllers/workloadidentitybindings/api/v1alpha1/groupversion_info.go b/porch/controllers/workloadidentitybindings/api/v1alpha1/groupversion_info.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects
diff --git a/porch/internal/api/porchinternal/v1alpha1/groupversion_info.go b/porch/internal/api/porchinternal/v1alpha1/groupversion_info.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object object:headerFile="../../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
 
 var (
 	// GroupVersion is group version used to register these objects

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"sigs.k8s.io/kustomize/kyaml/yaml"`
`25`	`25`	`)`
`26`	`26`
`27`		`-//go:generate go run sigs.k8s.io/controller-tools/cmd/[email protected] object object:headerFile="../../../../porch/scripts/boilerplate.go.txt"`
	`27`	`+//go:generate go run sigs.k8s.io/controller-tools/cmd/[email protected] object:headerFile="../../../../porch/scripts/boilerplate.go.txt"`
`28`	`28`
`29`	`29`	`const (`
`30`	`30`	`KptFileName = "Kptfile"`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"k8s.io/apimachinery/pkg/runtime/schema"`
`24`	`24`	`)`
`25`	`25`
`26`		`-//go:generate go run sigs.k8s.io/controller-tools/cmd/[email protected] object object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...`
	`26`	`+//go:generate go run sigs.k8s.io/controller-tools/cmd/[email protected] object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...`
`27`	`27`
`28`	`28`	`var (`
`29`	`29`	`// GroupVersion is group version used to register these objects`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"sigs.k8s.io/controller-runtime/pkg/scheme"`
`23`	`23`	`)`
`24`	`24`
`25`		`-//go:generate go run sigs.k8s.io/controller-tools/cmd/[email protected] object object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."`
	`25`	`+//go:generate go run sigs.k8s.io/controller-tools/cmd/[email protected] object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."`
`26`	`26`
`27`	`27`	`var (`
`28`	`28`	`// GroupVersion is group version used to register these objects`