Merge pull request #946 from shahulsonhal/crd-verify

Update Verify CI job to check CRD generation

.github/workflows/verify.yaml

@@ -40,4 +40,4 @@ jobs:
       run: |
         make -C $GOPATH/src/github.com/shipwright-io/build \
           sanity-check \
-          verify-codegen
+          verify-generate

DEVELOPMENT.md

@@ -147,7 +147,7 @@ As you make changes to the code, you can redeploy your controller with:
    ```
 You may use the following command to re-generate CRDs of build and buildrun if you change their spec:
    ```sh
-   make generate-crds
+   make generate
    ```
 
 ### Tear it down

Makefile

@@ -107,9 +107,11 @@ generate:
 	hack/update-codegen.sh
 	hack/generate-fakes.sh
 	hack/generate-copyright.sh
+	hack/install-controller-gen.sh
+	"$(CONTROLLER_GEN)" "$(CRD_OPTIONS)" rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=deploy/crds
 
-.PHONY: verify-codegen
-verify-codegen: generate
+.PHONY: verify-generate
+verify-generate: generate
 	@hack/verify-generate.sh
 
 ginkgo:
@@ -299,6 +301,3 @@ kind:
 	./hack/install-kind.sh
 	./hack/install-registry.sh
 
-generate-crds:
-	./hack/install-controller-gen.sh
-	"$(CONTROLLER_GEN)" "$(CRD_OPTIONS)" rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=deploy/crds

hack/README.md

@@ -18,3 +18,4 @@ This directory contains several scripts useful in the development process of Shi
 - `release.sh` Creates a new release of Shipwright Build.
 - `update-codegen.sh` Updates auto-generated client libraries.
 - `verify-codegen.sh` Verifies that auto-generated client libraries are up-to-date.
+- `verify-generate.sh` Check both uncommitted/unstaged changes for CRDs and the client code.

hack/verify-generate.sh

@@ -6,11 +6,11 @@
 
 # Verifies if a developer has forgot to run the
 # `make generate` so that all the changes in the
-# clientset should also be pushed
+# clientset and CRDs should also be pushed
 
-if [[ -n "$(git status --porcelain -- pkg/client)" ]]; then
-  echo "The pkg/client package contains changes:"
-  git --no-pager diff --name-only -- pkg/client
+if [[ -n "$(git status --porcelain -- pkg/client pkg/apis deploy/crds)" ]]; then
+  echo "The pkg/client, pkg/apis package or CRDs contains changes:"
+  git --no-pager diff --name-only -- pkg/client pkg/apis deploy/crds
   echo
   echo "Run make generate to those commit changes!"
   exit 1