diff --git a/pkg/api/kptfile/v1/types.go b/pkg/api/kptfile/v1/types.go index 1f9659a8a6..29aa28b20a 100644 --- 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:headerFile="../../../../porch/scripts/boilerplate.go.txt" const ( KptFileName = "Kptfile" diff --git a/pkg/api/kptfile/v1/zz_generated.deepcopy.go b/pkg/api/kptfile/v1/zz_generated.deepcopy.go index 512803e846..8818c129b4 100644 --- a/pkg/api/kptfile/v1/zz_generated.deepcopy.go +++ b/pkg/api/kptfile/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2023 The kpt Authors // diff --git a/porch/api/porchconfig/v1alpha1/groupversion_info.go b/porch/api/porchconfig/v1alpha1/groupversion_info.go index 34406ed617..09fc68acd9 100644 --- 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: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 index 8b4cec1de6..9bfe85dda4 100644 --- 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: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 index e47bfc890b..811e0d1fce 100644 --- 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 index 68f345ec43..da89bb1a5b 100644 --- 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 index 770f1d0f16..914fac899a 100644 --- 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 index 9938af34e8..6eb10cdb57 100644 --- 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 index f07337961b..60010d83d8 100644 --- 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 index 3b31989fec..b0010b886f 100644 --- 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:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..." var ( // GroupVersion is group version used to register these objects diff --git a/porch/controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go b/porch/controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go index 66335c9d49..3c17df3c62 100644 --- a/porch/controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go +++ b/porch/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 index 3b31989fec..b0010b886f 100644 --- 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: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 index 44f22a354e..5b38b9e530 100644 --- 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:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..." var ( // GroupVersion is group version used to register these objects diff --git a/porch/controllers/packagevariantsets/pkg/controllers/packagevariantset/packagevariantset_controller.go b/porch/controllers/packagevariantsets/pkg/controllers/packagevariantset/packagevariantset_controller.go index 690fd2a49c..9cc8633458 100644 --- a/porch/controllers/packagevariantsets/pkg/controllers/packagevariantset/packagevariantset_controller.go +++ b/porch/controllers/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 index 3b31989fec..b0010b886f 100644 --- 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:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..." var ( // GroupVersion is group version used to register these objects diff --git a/porch/controllers/remoterootsyncsets/pkg/controllers/remoterootsyncset/remoterootsync_controller.go b/porch/controllers/remoterootsyncsets/pkg/controllers/remoterootsyncset/remoterootsync_controller.go index 0f0f474184..afc7c436c5 100644 --- a/porch/controllers/remoterootsyncsets/pkg/controllers/remoterootsyncset/remoterootsync_controller.go +++ b/porch/controllers/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 index 3b31989fec..b0010b886f 100644 --- 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: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 index 40f4851114..1741659f21 100644 --- 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 index 3b31989fec..b0010b886f 100644 --- 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: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 index f16d213919..c368b6aaa0 100644 --- 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 index 3b31989fec..b0010b886f 100644 --- 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: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 index 44374f723e..2bbd922e42 100644 --- 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 index 3b31989fec..b0010b886f 100644 --- 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:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..." var ( // GroupVersion is group version used to register these objects diff --git a/porch/controllers/workloadidentitybindings/pkg/controllers/workloadidentitybinding/controller.go b/porch/controllers/workloadidentitybindings/pkg/controllers/workloadidentitybinding/controller.go index 39fcec9c76..9881775610 100644 --- a/porch/controllers/workloadidentitybindings/pkg/controllers/workloadidentitybinding/controller.go +++ b/porch/controllers/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/config.porch.kpt.dev_packagerevs.yaml b/porch/internal/api/porchinternal/v1alpha1/config.porch.kpt.dev_packagerevs.yaml index 75bbc23cbb..80f0045498 100644 --- a/porch/internal/api/porchinternal/v1alpha1/config.porch.kpt.dev_packagerevs.yaml +++ b/porch/internal/api/porchinternal/v1alpha1/config.porch.kpt.dev_packagerevs.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 The kpt Authors +# Copyright 2024 The kpt Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,8 +17,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: packagerevs.config.porch.kpt.dev spec: group: config.porch.kpt.dev @@ -35,14 +34,19 @@ spec: description: PackageRev properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -57,9 +61,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/porch/internal/api/porchinternal/v1alpha1/groupversion_info.go b/porch/internal/api/porchinternal/v1alpha1/groupversion_info.go index 553a704f85..323d277d38 100644 --- 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: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/internal/api/porchinternal/v1alpha1/zz_generated.deepcopy.go b/porch/internal/api/porchinternal/v1alpha1/zz_generated.deepcopy.go index 0ef45558d5..bff9376714 100644 --- a/porch/internal/api/porchinternal/v1alpha1/zz_generated.deepcopy.go +++ b/porch/internal/api/porchinternal/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2023 The kpt Authors // diff --git a/porch/pkg/git/git.go b/porch/pkg/git/git.go index 3842fa8d6f..37857916e2 100644 --- a/porch/pkg/git/git.go +++ b/porch/pkg/git/git.go @@ -58,7 +58,7 @@ type GitRepository interface { UpdateDeletionProposedCache() error } -//go:generate go run golang.org/x/tools/cmd/stringer -type=MainBranchStrategy -linecomment +//go:generate go run golang.org/x/tools/cmd/stringer@v0.19.0 -type=MainBranchStrategy -linecomment type MainBranchStrategy int const (