chore: fix crdgen issue after upgrading (#1361)

Signed-off-by: Derek Wang <[email protected]>

.github/workflows/ci.yaml

@@ -30,7 +30,8 @@ jobs:
       - name: Install protoc
         run: |
           set -eux -o pipefail
-          PROTOC_ZIP=protoc-3.11.1-linux-x86_64.zip
+          PROTOC_VERSION=3.11.1
+          PROTOC_ZIP=protoc-$PROTOC_VERSION-linux-x86_64.zip
           curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.1/$PROTOC_ZIP
           sudo unzip -o $PROTOC_ZIP -d /usr/local bin/protoc
           sudo unzip -o $PROTOC_ZIP -d /usr/local 'include/*'
@@ -42,11 +43,12 @@ jobs:
       - name: Install pandoc
         run: |
           set -eux -o pipefail
-          PANDOC_ZIP=pandoc-2.11.1-linux-amd64.tar.gz
-          curl -OL https://github.com/jgm/pandoc/releases/download/2.11.1/$PANDOC_ZIP
+          PANDOC_VERSION=2.14.2
+          PANDOC_ZIP=pandoc-$PANDOC_VERSION-linux-amd64.tar.gz
+          curl -OL https://github.com/jgm/pandoc/releases/download/$PANDOC_VERSION/$PANDOC_ZIP
           sudo tar xvzf $PANDOC_ZIP --strip-components 1 -C /usr/local
           rm -f $PANDOC_ZIP
-          echo /usr/local/pandoc-2.11.1/bin >> $GITHUB_PATH
+          echo /usr/local/pandoc-$PANDOC_VERSION/bin >> $GITHUB_PATH
       - name: Get dependencies
         run: go mod download
       - name: Make codegen

hack/crdgen.sh

@@ -16,6 +16,8 @@ fi
 header "Generating CRDs"
 controller-gen crd:crdVersions=v1,trivialVersions=true,maxDescLen=0 paths=./pkg/apis/... output:dir=manifests/base/crds
 
+mv manifests/base/crds/argoproj.io_eventbuses.yaml manifests/base/crds/argoproj.io_eventbus.yaml
+
 find manifests/base/crds -name 'argoproj.io*.yaml' | while read -r file; do
   echo "Patching ${file}"
   # remove junk fields

hack/crds.go

@@ -20,10 +20,17 @@ func cleanCRD(filename string) {
 	}
 	delete(crd, "status")
 	metadata := crd["metadata"].(obj)
+	if metadata["name"] == "eventbuses.argoproj.io" {
+		metadata["name"] = "eventbus.argoproj.io"
+	}
 	delete(metadata, "annotations")
 	delete(metadata, "creationTimestamp")
 	spec := crd["spec"].(obj)
 	delete(spec, "validation")
+	names := spec["names"].(obj)
+	if names["plural"] == "eventbuses" {
+		names["plural"] = "eventbus"
+	}
 	versions := spec["versions"].([]interface{})
 	version := versions[0].(obj)
 	properties := version["schema"].(obj)["openAPIV3Schema"].(obj)["properties"].(obj)

hack/generate-proto.sh

@@ -7,6 +7,7 @@ set -o pipefail
 source $(dirname $0)/library.sh
 header "generating proto files"
 
+ensure_protobuf
 ensure_vendor
 
 if [ "`command -v protoc-gen-gogo`" = "" ]; then

hack/library.sh

@@ -45,6 +45,13 @@ ensure_pandoc() {
   fi
 }
 
+ensure_protobuf() {
+  if [ "`command -v protoc`" = "" ]; then
+    warning "Please install protobuf with - brew install protobuf"
+    exit 1
+  fi
+}
+
 ensure_mockery() {
   if [ "`command -v mockery`" = "" ]; then
     warning "Please install mockery with - brew install vektra/tap/mockery"