From 9ac35f96989622bf16bdf5141a73ebb89f81ef86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Wed, 16 Mar 2022 10:31:35 +0100 Subject: [PATCH] chore: add more codegen target and verifications (#3393) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché Co-authored-by: Prateek Pandey --- Makefile | 33 ++++++++++++++++----------------- go.mod | 4 ++-- go.sum | 6 ++++-- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index fd0c93974c..7ef8aef57c 100644 --- a/Makefile +++ b/Makefile @@ -158,8 +158,7 @@ generate-api-docs: gen-crd-api-reference-docs ## Generate api reference docs .PHONY: verify-api-docs verify-api-docs: generate-api-docs ## Check api reference docs are up to date - git add --all - git diff docs + git --no-pager diff docs @echo 'If this test fails, it is because the git diff is non-empty after running "make generate-api-docs".' @echo 'To correct this, locally run "make generate-api-docs", commit the changes, and re-run tests.' git diff --quiet --exit-code docs @@ -378,16 +377,25 @@ deepcopy-autogen: controller-gen $(CONTROLLER_GEN) object:headerFile="scripts/boilerplate.go.txt" paths="./..." .PHONY: codegen -codegen: kyverno-crd report-crd deepcopy-autogen gen-helm +codegen: kyverno-crd report-crd deepcopy-autogen generate-api-docs gen-helm ## Update all generated code and docs -.PHONY: verify-codegen -verify-codegen: codegen - git add --all - git diff api +.PHONY: verify-api +verify-api: kyverno-crd report-crd deepcopy-autogen ## Check api is up to date + git --no-pager diff api @echo 'If this test fails, it is because the git diff is non-empty after running "make codegen".' @echo 'To correct this, locally run "make codegen", commit the changes, and re-run tests.' git diff --quiet --exit-code api +.PHONY: verify-config +verify-config: kyverno-crd report-crd ## Check config is up to date + git --no-pager diff config + @echo 'If this test fails, it is because the git diff is non-empty after running "make codegen".' + @echo 'To correct this, locally run "make codegen", commit the changes, and re-run tests.' + git diff --quiet --exit-code config + +.PHONY: verify-codegen +verify-codegen: verify-api verify-config verify-api-docs verify-helm ## Verify all generated code and docs are up to date + .PHONY: goimports goimports: ifeq (, $(shell which goimports)) @@ -422,16 +430,7 @@ gen-helm: gen-helm-docs kustomize-crd ## Generate Helm charts stuff .PHONY: verify-helm verify-helm: gen-helm ## Check Helm charts are up to date - git add --all - git diff charts + git --no-pager diff charts @echo 'If this test fails, it is because the git diff is non-empty after running "make gen-helm".' @echo 'To correct this, locally run "make gen-helm", commit the changes, and re-run tests.' git diff --quiet --exit-code charts - -.PHONY: check-helm-docs -check-helm-docs: gen-helm-docs ## Check Helm docs - git add --all - git diff charts/**/README.md - @echo 'If this test fails, it is because the git diff is non-empty after running "make gen-helm-docs".' - @echo 'To correct this, locally run "make gen-helm-docs", commit the changes, and re-run tests.' - git diff --quiet --exit-code charts/**/README.md diff --git a/go.mod b/go.mod index 9561f93c4b..10109d5d86 100644 --- a/go.mod +++ b/go.mod @@ -47,8 +47,8 @@ require ( k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf sigs.k8s.io/controller-runtime v0.11.0 - sigs.k8s.io/kustomize/api v0.10.1 - sigs.k8s.io/kustomize/kyaml v0.13.0 + sigs.k8s.io/kustomize/api v0.11.2 + sigs.k8s.io/kustomize/kyaml v0.13.3 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index f6df40c913..9a50dce460 100644 --- a/go.sum +++ b/go.sum @@ -2862,10 +2862,12 @@ sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3L sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/kustomize/api v0.10.1 h1:KgU7hfYoscuqag84kxtzKdEC3mKMb99DPI3a0eaV1d0= sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8= -sigs.k8s.io/kustomize/kyaml v0.13.0 h1:9c+ETyNfSrVhxvphs+K2dzT3dh5oVPPEqPOE/cUpScY= +sigs.k8s.io/kustomize/api v0.11.2 h1:6YvCJHFDwsLwAX7zNHBxMZi3k7dGIXI8G9l0saYQI0E= +sigs.k8s.io/kustomize/api v0.11.2/go.mod h1:GZuhith5YcqxIDe0GnRJNx5xxPTjlwaLTt/e+ChUtJA= sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E= +sigs.k8s.io/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4= +sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/release-utils v0.4.1-0.20220207182343-6dadf2228617 h1:qbKzP8fFAdlnj4WqB9KrAuW4ply+bUQkdRlVrH4Jus0= sigs.k8s.io/release-utils v0.4.1-0.20220207182343-6dadf2228617/go.mod h1:t9pL38kZkTBVDcjL1y7ajrkNQFLiArVAjOVO0sxzFF0= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=