Skip to content

Commit 78597b0

Browse files
authored
Fix make generate target (#331)
* Fix make generate target Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> * Readd stripped header Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> --------- Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>
1 parent dfaaa30 commit 78597b0

18 files changed

Lines changed: 45 additions & 40 deletions

File tree

api/porchconfig/v1alpha1/config.porch.kpt.dev_repositories.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apiVersion: apiextensions.k8s.io/v1
1515
kind: CustomResourceDefinition
1616
metadata:
1717
annotations:
18-
controller-gen.kubebuilder.io/version: v0.16.1
18+
controller-gen.kubebuilder.io/version: v0.19.0
1919
name: repositories.config.porch.kpt.dev
2020
spec:
2121
group: config.porch.kpt.dev

api/porchconfig/v1alpha1/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"k8s.io/apimachinery/pkg/runtime/schema"
2424
)
2525

26-
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 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/controller-gen@v0.19.0 object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
2727

2828
var (
2929
// GroupVersion is group version used to register these objects

controllers/config/crd/bases/config.porch.kpt.dev_packagevariants.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
---
1415
apiVersion: apiextensions.k8s.io/v1
1516
kind: CustomResourceDefinition
1617
metadata:
1718
annotations:
18-
controller-gen.kubebuilder.io/version: v0.16.1
19+
controller-gen.kubebuilder.io/version: v0.19.0
1920
name: packagevariants.config.porch.kpt.dev
2021
spec:
2122
group: config.porch.kpt.dev

controllers/config/crd/bases/config.porch.kpt.dev_packagevariantsets.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
---
1415
apiVersion: apiextensions.k8s.io/v1
1516
kind: CustomResourceDefinition
1617
metadata:
1718
annotations:
18-
controller-gen.kubebuilder.io/version: v0.16.1
19+
controller-gen.kubebuilder.io/version: v0.19.0
1920
name: packagevariantsets.config.porch.kpt.dev
2021
spec:
2122
group: config.porch.kpt.dev

controllers/config/rbac/role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
---
1415
apiVersion: rbac.authorization.k8s.io/v1
1516
kind: ClusterRole
1617
metadata:

controllers/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
package main
1616

17-
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 rbac:headerFile=../scripts/boilerplate.yaml.txt,roleName=porch-controllers webhook paths="."
17+
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 rbac:headerFile=../scripts/boilerplate.yaml.txt,roleName=porch-controllers webhook paths="."
1818

19-
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 crd:headerFile=../scripts/boilerplate.yaml.txt paths="./..." output:crd:artifacts:config=config/crd/bases
19+
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 crd:headerFile=../scripts/boilerplate.yaml.txt paths="./..." output:crd:artifacts:config=config/crd/bases
2020

2121
import (
2222
"context"

controllers/packagevariants/api/v1alpha1/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sigs.k8s.io/controller-runtime/pkg/scheme"
2323
)
2424

25-
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
25+
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
2626

2727
var (
2828
// GroupVersion is group version used to register these objects

controllers/packagevariants/config/rbac/role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
---
1415
apiVersion: rbac.authorization.k8s.io/v1
1516
kind: ClusterRole
1617
metadata:

controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const (
6161
ConditionTypeReady = "Ready" // whether or not the reconciliation succeeded
6262
)
6363

64-
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 rbac:headerFile=../../../../../scripts/boilerplate.yaml.txt,roleName=porch-controllers-packagevariants webhook paths="." output:rbac:artifacts:config=../../../config/rbac
64+
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 rbac:headerFile=../../../../../scripts/boilerplate.yaml.txt,roleName=porch-controllers-packagevariants webhook paths="." output:rbac:artifacts:config=../../../config/rbac
6565

6666
//+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=packagevariants,verbs=get;list;watch;create;update;patch;delete
6767
//+kubebuilder:rbac:groups=config.porch.kpt.dev,resources=packagevariants/status,verbs=get;update;patch

controllers/packagevariantsets/api/v1alpha1/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sigs.k8s.io/controller-runtime/pkg/scheme"
2323
)
2424

25-
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
25+
//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
2626

2727
var (
2828
// GroupVersion is group version used to register these objects

0 commit comments

Comments
 (0)