From 24f107fffc036704bce887c84d99d62ab8298fa1 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Sat, 8 Feb 2025 13:07:05 +0200 Subject: [PATCH 1/2] Fix `timoni:generate` header Signed-off-by: Stefan Prodan --- cmd/timoni/mod_vendor_crd.go | 2 +- .../cue.mod/gen/acme.cert-manager.io/challenge/v1/types_gen.cue | 2 +- .../cue.mod/gen/acme.cert-manager.io/order/v1/types_gen.cue | 2 +- .../cue.mod/gen/cert-manager.io/certificate/v1/types_gen.cue | 2 +- .../gen/cert-manager.io/certificaterequest/v1/types_gen.cue | 2 +- .../cue.mod/gen/cert-manager.io/clusterissuer/v1/types_gen.cue | 2 +- .../golden/cue.mod/gen/cert-manager.io/issuer/v1/types_gen.cue | 2 +- .../cue.mod/gen/flagger.app/alertprovider/v1beta1/types_gen.cue | 2 +- .../golden/cue.mod/gen/flagger.app/canary/v1beta1/types_gen.cue | 2 +- .../gen/flagger.app/metrictemplate/v1beta1/types_gen.cue | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/timoni/mod_vendor_crd.go b/cmd/timoni/mod_vendor_crd.go index c60bdbf4..8687f85b 100644 --- a/cmd/timoni/mod_vendor_crd.go +++ b/cmd/timoni/mod_vendor_crd.go @@ -66,7 +66,7 @@ func init() { const header = `// Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f ` +//timoni:generate timoni mod vendor crd -f ` func runVendorCrdCmd(cmd *cobra.Command, args []string) error { if len(args) > 0 { diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/challenge/v1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/challenge/v1/types_gen.cue index afb23543..d3337065 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/challenge/v1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/challenge/v1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/cert-manager.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/cert-manager.crds.yaml package v1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/order/v1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/order/v1/types_gen.cue index 026f4e13..92277a33 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/order/v1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/order/v1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/cert-manager.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/cert-manager.crds.yaml package v1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificate/v1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificate/v1/types_gen.cue index cd1e1baf..64499f6c 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificate/v1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificate/v1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/cert-manager.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/cert-manager.crds.yaml package v1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificaterequest/v1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificaterequest/v1/types_gen.cue index ba4b617a..e67b31a4 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificaterequest/v1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/certificaterequest/v1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/cert-manager.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/cert-manager.crds.yaml package v1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/clusterissuer/v1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/clusterissuer/v1/types_gen.cue index 04bdf261..e3c6d5ed 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/clusterissuer/v1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/clusterissuer/v1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/cert-manager.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/cert-manager.crds.yaml package v1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/issuer/v1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/issuer/v1/types_gen.cue index c0aec8b7..cfbd83ef 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/issuer/v1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/issuer/v1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/cert-manager.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/cert-manager.crds.yaml package v1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/alertprovider/v1beta1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/alertprovider/v1beta1/types_gen.cue index 4e2bcbbb..334074c8 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/alertprovider/v1beta1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/alertprovider/v1beta1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/flagger.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/flagger.crds.yaml package v1beta1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/canary/v1beta1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/canary/v1beta1/types_gen.cue index 72f59c52..bab4119c 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/canary/v1beta1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/canary/v1beta1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/flagger.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/flagger.crds.yaml package v1beta1 diff --git a/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/metrictemplate/v1beta1/types_gen.cue b/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/metrictemplate/v1beta1/types_gen.cue index ab00d3ee..9708c4c3 100644 --- a/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/metrictemplate/v1beta1/types_gen.cue +++ b/cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/metrictemplate/v1beta1/types_gen.cue @@ -1,6 +1,6 @@ // Code generated by timoni. DO NOT EDIT. -//timoni:generate timoni vendor crd -f testdata/crd/source/flagger.crds.yaml +//timoni:generate timoni mod vendor crd -f testdata/crd/source/flagger.crds.yaml package v1beta1 From debd64bb19fb5b68ba3e4768f55a6f442cb2c54d Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Sat, 8 Feb 2025 13:07:22 +0200 Subject: [PATCH 2/2] Update workflow actions Signed-off-by: Stefan Prodan --- .github/workflows/build.yaml | 2 +- .github/workflows/e2e.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 12fa8209..d80c9534 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,7 +22,7 @@ jobs: - name: Setup CUE uses: cue-lang/setup-cue@a93fa358375740cd8b0078f76355512b9208acb1 # main with: - version: v0.11.0 + version: v0.12.0 - name: Run tests run: make test - name: Run linter diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index db9b468e..dd234df1 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -28,7 +28,7 @@ jobs: - name: Setup Kubernetes uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: - version: v0.25.0 + version: v0.26.0 node_image: kindest/node:v1.32.0 cluster_name: kind - name: Install