From 0625438700dffd9a261a681e2a0cb7c31226964f Mon Sep 17 00:00:00 2001
From: Graham McIntire <graham@mcintire.me>
Date: Tue, 28 Apr 2026 14:24:53 -0500
Subject: [PATCH] Revert "ci: deploy via rollout restart instead of git-commit
 image bumps"

This reverts commit f093b1bb4bdb8f6e5e379b16ec79fc8310024c27.
---
 .forgejo/workflows/build.yaml | 25 ++++++++++++++-----------
 k8s/deployment.yaml           |  8 ++++----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 92c71eb..a66b3ab 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -45,17 +45,20 @@ jobs:
           docker push "${IMAGE}:${TAG}"
           docker push "${IMAGE}:main"
 
-      - name: Install kubectl
+      - name: Update deployment manifest
         run: |
-          curl -sLO "https://dl.k8s.io/release/$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          install -m 0755 kubectl /usr/local/bin/kubectl
+          IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          TAG="${{ steps.tag.outputs.tag }}"
+          sed -i "s|image: ${IMAGE}:.*|image: ${IMAGE}:${TAG}|g" k8s/deployment.yaml
 
-      - name: Trigger rollout (no git commit)
-        env:
-          KUBECONFIG_DATA: ${{ secrets.KUBECONFIG_DATA }}
+      - name: Commit and push updated manifest
         run: |
-          mkdir -p "$HOME/.kube"
-          printf '%s' "$KUBECONFIG_DATA" | base64 -d > "$HOME/.kube/config"
-          chmod 600 "$HOME/.kube/config"
-          kubectl -n aprs rollout restart deployment/aprs
-          kubectl -n aprs rollout status deployment/aprs --timeout=5m
+          IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          TAG="${{ steps.tag.outputs.tag }}"
+          git config user.name "FluxCD"
+          git config user.email "fluxcd@w5isp.com"
+          git remote set-url origin https://x-token:${{ github.token }}@git.mcintire.me/graham/aprs.me.git
+          git add k8s/deployment.yaml
+          git diff --cached --quiet && echo "No changes to commit" && exit 0
+          git commit -m "chore: update aprs.me image to ${IMAGE}:${TAG} [skip ci]"
+          git push origin main
diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index 629643c..f5437de 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -31,8 +31,8 @@ spec:
           type: RuntimeDefault
       initContainers:
         - name: migrate
-          image: git.mcintire.me/graham/aprs.me:main
-          imagePullPolicy: Always
+          image: git.mcintire.me/graham/aprs.me:main-1777403979-3f2e025
+          imagePullPolicy: IfNotPresent
           command: ["/app/bin/migrate"]
           securityContext:
             allowPrivilegeEscalation: false
@@ -82,8 +82,8 @@ spec:
               cpu: "500m"
       containers:
         - name: aprs
-          image: git.mcintire.me/graham/aprs.me:main
-          imagePullPolicy: Always
+          image: git.mcintire.me/graham/aprs.me:main-1777403979-3f2e025
+          imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
             runAsNonRoot: true