chore(build): update release scripts and build targets to sync up in crd branch (#1288)

Signed-off-by: Cheng Fang <[email protected]>

Author: chengfang

.github/workflows/ci-tests.yaml

@@ -48,9 +48,9 @@ jobs:
           tar -C /tmp -xvzf /tmp/kustomize.tar.gz
           sudo mv /tmp/kustomize /usr/local/bin/kustomize
           chmod +x /usr/local/bin/kustomize
-      - name: Run make manifests
+      - name: Run make build-installer
         run: |
-          make manifests
+          IMAGE_TAG=latest make build-installer
       - name: Check nothing has changed
         run: |
           set -xo pipefail

.github/workflows/create-release-draft.yaml

@@ -41,7 +41,7 @@ jobs:
         run: |
           set -ex
           docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}" quay.io
-          IMAGE_PUSH=yes IMAGE_TAG=v${{ steps.version.outputs.version }} make multiarch-image
+          IMAGE_PUSH=yes IMAGE_TAG=v${{ steps.version.outputs.version }} make docker-buildx
         env:
           DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.QUAY_TOKEN }}

.github/workflows/image.yaml

@@ -37,9 +37,9 @@ jobs:
             docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}" quay.io
           fi
           if [[ "${MULTIARCH}" = "yes" ]]; then
-            IMAGE_PUSH=${PUSH} make multiarch-image
+            IMAGE_PUSH=${PUSH} make docker-buildx
           else
-            make image
+            make docker-build
           fi
         working-directory: argocd-image-updater
         env:

Makefile

@@ -159,9 +159,8 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 
 .PHONY: build-installer
 build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment.
-	mkdir -p dist
 	cd config/manager && $(KUSTOMIZE) edit set image argocd-image-updater-controller=${IMG}
-	$(KUSTOMIZE) build config/default > dist/install.yaml
+	$(KUSTOMIZE) build config/default > config/install.yaml
 
 .PHONY: release-binaries
 release-binaries:

hack/create-release-pr.sh

@@ -30,7 +30,7 @@ if [[ ! $(git ls-remote --exit-code ${REMOTE_URL} ${RELEASE_BRANCH}) ]]; then
 fi
 
 ### look for latest on-branch tag
-PREVIOUS_TAG=$(git describe --tags --abbrev=0 --match "*${RELEASE_BRANCH##release-}*" 2>/dev/null || true)
+PREVIOUS_TAG=$(git describe --tags --abbrev=0 --match "v${RELEASE_BRANCH##release-}*" 2>/dev/null || true)
 
 if [ -n "$PREVIOUS_TAG" ]; then
     NEW_VERSION=$(semver-cli inc patch $PREVIOUS_TAG)
@@ -41,13 +41,13 @@ fi
 echo $NEW_VERSION > VERSION
 IMAGE_TAG="v${NEW_VERSION}"
 # Update manifests
-make manifests
+make build-installer
 
 # Create PR for the release
 git checkout -b "feat/new-version-${NEW_VERSION}"
 
 # Commit and push the changes
-git commit -m "Release ${NEW_VERSION}" VERSION manifests/
+git commit -m "Release ${NEW_VERSION}" VERSION config/
 git push --set-upstream ${REMOTE} "feat/new-version-${NEW_VERSION}"
 gh label --repo ${REMOTE_URL} create --force release
 gh pr --repo ${REMOTE_URL} \