chore: update controller-tools to 0.14.0

Older versions of controller-tools panic with newer go versions. Signed-off-by: justinsb <justinsb@google.com>
kptdev · Mar 28, 2024 · 5ff42ea · 5ff42ea
1 parent 9d58c99
commit 5ff42ea
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 25 deletions.
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.8.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 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.8.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 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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/porch/controllers/fleetsyncs/pkg/controllers/fleetsync/controller.go b/porch/controllers/fleetsyncs/pkg/controllers/fleetsync/controller.go
@@ -71,7 +71,7 @@ type FleetSyncReconciler struct {
 	recorder record.EventRecorder
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-fleetsyncs webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-fleetsyncs webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=fleetsyncs,verbs=get;list;watch
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=fleetsyncs/status,verbs=get;update;patch

diff --git a/porch/controllers/functiondiscovery/controller.go b/porch/controllers/functiondiscovery/controller.go
@@ -53,7 +53,7 @@ type FunctionReconciler struct {
 	ociStorage *kptoci.Storage
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-functions webhook paths="." output:rbac:artifacts:config=config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-functions webhook paths="." output:rbac:artifacts:config=config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=repositories,verbs=get;list;watch
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=functions,verbs=get;list;watch;create;update;patch;delete

diff --git a/porch/controllers/functiondiscovery/doc.go b/porch/controllers/functiondiscovery/doc.go
@@ -14,4 +14,4 @@
 
 package functiondiscovery
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-functiondiscovery webhook paths="./..." output:rbac:artifacts:config=config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-functiondiscovery webhook paths="./..." output:rbac:artifacts:config=config/rbac
diff --git a/porch/controllers/klippy/doc.go b/porch/controllers/klippy/doc.go
@@ -14,4 +14,4 @@
 
 package klippy
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-klippy webhook paths="./..." output:rbac:artifacts:config=config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-klippy webhook paths="./..." output:rbac:artifacts:config=config/rbac
diff --git a/porch/controllers/main.go b/porch/controllers/main.go
@@ -14,9 +14,9 @@
 
 package main
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers webhook paths="."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers webhook paths="."
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 crd paths="./..." output:crd:artifacts:config=config/crd/bases
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 crd paths="./..." output:crd:artifacts:config=config/crd/bases
 
 import (
 	"context"

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/...h/controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go b/...h/controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go
@@ -64,7 +64,7 @@ const (
 	requeueDuration = 30 * time.Second
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-packagevariants webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-packagevariants webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=packagevariants,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=packagevariants/status,verbs=get;update;patch

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.8.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 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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/...lers/packagevariantsets/pkg/controllers/packagevariantset/packagevariantset_controller.go b/...lers/packagevariantsets/pkg/controllers/packagevariantset/packagevariantset_controller.go
@@ -68,7 +68,7 @@ const (
 	PackageVariantNameHashLength = 8
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-packagevariantsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-packagevariantsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=packagevariantsets,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=packagevariantsets/status,verbs=get;update;patch

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/...rollers/remoterootsyncsets/pkg/controllers/remoterootsyncset/remoterootsync_controller.go b/...rollers/remoterootsyncsets/pkg/controllers/remoterootsyncset/remoterootsync_controller.go
@@ -75,7 +75,7 @@ type RemoteRootSyncSetReconciler struct {
 	localRESTConfig *rest.Config
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-remoterootsyncsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-remoterootsyncsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=remoterootsyncsets,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=remoterootsyncsets/status,verbs=get;update;patch

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/porch/controllers/rootsyncdeployments/pkg/controllers/rootsyncdeployment/controller.go b/porch/controllers/rootsyncdeployments/pkg/controllers/rootsyncdeployment/controller.go
@@ -86,7 +86,7 @@ type RootSyncDeploymentReconciler struct {
 	clusterTargetCache map[types.NamespacedName]labels.Selector
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-rootsyncdeployments webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-rootsyncdeployments webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=rootsyncdeployments,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=rootsyncdeployments/status,verbs=get;update;patch

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/porch/controllers/rootsyncrollouts/pkg/controllers/rootsyncrollout/controller.go b/porch/controllers/rootsyncrollouts/pkg/controllers/rootsyncrollout/controller.go
@@ -66,7 +66,7 @@ type RootSyncRolloutReconciler struct {
 	packageTargetCache map[types.NamespacedName]v1alpha1.PackageSelector
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-rootsyncrollouts webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-rootsyncrollouts webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=rootsyncrollouts,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=rootsyncrollouts/status,verbs=get;update;patch

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/porch/controllers/rootsyncsets/pkg/controllers/rootsyncset/controller.go b/porch/controllers/rootsyncsets/pkg/controllers/rootsyncset/controller.go
@@ -83,7 +83,7 @@ type RootSyncSetReconciler struct {
 	watchers map[v1alpha1.ClusterRef]*watcher
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-rootsyncsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-rootsyncsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=rootsyncsets,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=rootsyncsets/status,verbs=get;update;patch

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
 
 var (
 	// GroupVersion is group version used to register these objects

diff --git a/...ontrollers/workloadidentitybindings/pkg/controllers/workloadidentitybinding/controller.go b/...ontrollers/workloadidentitybindings/pkg/controllers/workloadidentitybinding/controller.go
@@ -57,7 +57,7 @@ type WorkloadIdentityBindingReconciler struct {
 	restMapper    meta.RESTMapper
 }
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 rbac:roleName=porch-controllers-workloadidentitybinding webhook paths="." output:rbac:artifacts:config=../../../config/rbac
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-workloadidentitybinding webhook paths="." output:rbac:artifacts:config=../../../config/rbac
 
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=workloadidentitybindings,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=workloadidentitybindings/status,verbs=get;update;patch

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.8.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 object:headerFile="../../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
 
 var (
 	// GroupVersion is group version used to register these objects