Clean up release.yaml CI:

Use new make target for building
and pushing images.

Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>

Author: jacobweinstock

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   CGO_ENABLED: 0
-  GO_VERSION: '1.25.1'
+  GO_VERSION: '1.25'
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}

.github/workflows/release.yaml

@@ -7,11 +7,11 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  GO_VERSION: '1.24'
+  GO_VERSION: '1.25'
 
 jobs:
-  manager-image:
-    name: Build and push manager image
+  build-image:
+    name: Build and push image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -22,63 +22,21 @@ jobs:
           go-version: "${{ env.GO_VERSION }}"
           cache: true
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-manager-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-manager-
-            ${{ runner.os }}-buildx-
-
-      - name: Docker manager metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: latest=false
-          tags: type=ref,event=tag
-
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push manager image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          build-args: |
-            LDFLAGS=${{ env.DOCKER_BUILD_LDFLAGS }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-      - name: Move cache
-        # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+      - name: Build and push image
+        run: make image-build-push
 
   release:
     name: Release
     runs-on: ubuntu-latest
     needs:
-      - manager-image
+      - build-image
     steps:
       - uses: actions/checkout@v5
 
@@ -87,23 +45,6 @@ jobs:
           go-version: "${{ env.GO_VERSION }}"
           cache: true
 
-      - uses: actions/cache@v4
-        with:
-          path: bin
-          key: ${{ runner.os }}-tools-bin-release-${{ hashFiles('Makefile') }}
-          restore-keys: |
-            ${{ runner.os }}-tools-bin-release-
-            ${{ runner.os }}-tools-bin-
-
-      - name: Docker manager metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: latest=false
-          tags: type=ref,event=tag
-
       - name: manifest
         run: make release
 

Makefile

@@ -138,17 +138,17 @@ generate-manifests: tools ## Generate manifests e.g. CRD, RBAC etc.
 build: generate $(GORELEASER) ## Build the CAPT binary
 	${GORELEASER} build --snapshot --clean
 
-## --------------------------------------
-## Container image build
-## --------------------------------------
-
 .PHONY: build-image
 build-image: $(GORELEASER) ## Build the container image
 	${GORELEASER} release --snapshot --clean --verbose
 
 .PHONY: image-build-push
 image-build-push: $(GORELEASER) ## Build and push the container image
-	${GORELEASER} release --clean --verbose --skip=validate
+	${GORELEASER} release --clean --verbose
+
+## --------------------------------------
+## Manifest Image Update
+## --------------------------------------
 
 .PHONY: set-manifest-image
 set-manifest-image: