feat: add environment-based image tags (prod/staging/dev) to CI templates

build-push.yaml now pushes branch-conditional env tags alongside SHA tags:
- main/master → prod, staging → staging, dev → dev
- Optional version input for pinned dev-v{N} tags
- New env-tag output for downstream consumers

deploy-k8s.yaml adds use-env-tag option:
- When true, skips SHA-based manifest updates and instead bumps a deploy
  annotation so ArgoCD rolls pods with the mutable tag
- Backward compatible: existing services using SHA tags are unaffected

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Martin Maslyankov
2026-04-03 20:31:49 +03:00
parent 432f2c1e8c
commit 0444056a38
2 changed files with 96 additions and 1 deletions

View File

@@ -29,6 +29,11 @@ on:
required: false required: false
type: string type: string
default: "" default: ""
version:
description: "Optional version for pinned dev tags (e.g. '123' produces 'dev-v123'). Only applies on dev branch."
required: false
type: string
default: ""
runner: runner:
description: "Runner label to use (e.g. ubuntu-latest, self-hosted-arm64). ARM64 builds use QEMU emulation on amd64 runners by default — set this to a native ARM64 runner for faster Rust/heavy builds." description: "Runner label to use (e.g. ubuntu-latest, self-hosted-arm64). ARM64 builds use QEMU emulation on amd64 runners by default — set this to a native ARM64 runner for faster Rust/heavy builds."
required: false required: false
@@ -43,6 +48,9 @@ on:
image-tag: image-tag:
description: "The sha-based image tag that was pushed" description: "The sha-based image tag that was pushed"
value: ${{ jobs.build.outputs.image-tag }} value: ${{ jobs.build.outputs.image-tag }}
env-tag:
description: "The environment tag that was pushed (prod, staging, dev, or dev-v{N})"
value: ${{ jobs.build.outputs.env-tag }}
jobs: jobs:
build: build:
@@ -53,6 +61,7 @@ jobs:
options: --privileged options: --privileged
outputs: outputs:
image-tag: ${{ steps.tag.outputs.tag }} image-tag: ${{ steps.tag.outputs.tag }}
env-tag: ${{ steps.tag.outputs.env-tag }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -64,6 +73,28 @@ jobs:
SHORT_SHA="${SHORT_SHA:0:7}" SHORT_SHA="${SHORT_SHA:0:7}"
echo "tag=sha-${SHORT_SHA}" >> "$GITEA_OUTPUT" echo "tag=sha-${SHORT_SHA}" >> "$GITEA_OUTPUT"
# Determine environment tag from branch
REF="${{ gitea.ref }}"
VERSION="${{ inputs.version }}"
case "$REF" in
refs/heads/main|refs/heads/master)
echo "env-tag=prod" >> "$GITEA_OUTPUT"
;;
refs/heads/staging)
echo "env-tag=staging" >> "$GITEA_OUTPUT"
;;
refs/heads/dev)
if [ -n "$VERSION" ]; then
echo "env-tag=dev-v${VERSION}" >> "$GITEA_OUTPUT"
else
echo "env-tag=dev" >> "$GITEA_OUTPUT"
fi
;;
*)
echo "env-tag=" >> "$GITEA_OUTPUT"
;;
esac
- name: Log in to Gitea registry - name: Log in to Gitea registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
@@ -79,6 +110,7 @@ jobs:
tags: | tags: |
type=sha,prefix=sha- type=sha,prefix=sha-
type=raw,value=latest,enable={{is_default_branch}} type=raw,value=latest,enable={{is_default_branch}}
type=raw,value=${{ steps.tag.outputs.env-tag }},enable=${{ steps.tag.outputs.env-tag != '' }}
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}

View File

@@ -22,6 +22,11 @@ on:
required: false required: false
type: string type: string
default: "wectrl-net/wectrl-k8s-cluster" default: "wectrl-net/wectrl-k8s-cluster"
use-env-tag:
description: "If true, skip SHA-based manifest update (service uses mutable env tags with imagePullPolicy: Always)"
required: false
type: boolean
default: false
secrets: secrets:
GIT_USER: GIT_USER:
required: true required: true
@@ -32,7 +37,7 @@ jobs:
deploy: deploy:
name: Update k8s Cluster Repo name: Update k8s Cluster Repo
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: gitea.ref == 'refs/heads/main' if: gitea.ref == 'refs/heads/main' && inputs.use-env-tag == false
steps: steps:
- name: Install yq - name: Install yq
shell: bash shell: bash
@@ -76,3 +81,61 @@ jobs:
git push origin main git push origin main
echo "Cluster repo updated — ArgoCD will sync within ~3 min" echo "Cluster repo updated — ArgoCD will sync within ~3 min"
fi fi
# When using mutable env tags, bump a deploy annotation so ArgoCD detects the change
notify-argocd:
name: Bump deploy annotation
runs-on: ubuntu-latest
if: inputs.use-env-tag == true
steps:
- name: Install yq
shell: bash
run: |
set -euo pipefail
ARCH=$(uname -m)
case "$ARCH" in
aarch64|arm64) YQ_ARCH="arm64" ;;
x86_64|amd64) YQ_ARCH="amd64" ;;
*) YQ_ARCH="amd64" ;;
esac
wget -qO /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.44.1/yq_linux_${YQ_ARCH}"
chmod +x /usr/local/bin/yq
- name: Bump annotation in cluster repo
shell: bash
run: |
set -euo pipefail
SHA="${{ gitea.sha }}"
SHORT_SHA="${SHA:0:7}"
TIMESTAMP="$(date -u +%Y%m%d%H%M%S)"
RUN_URL="${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}"
# Determine env from branch
REF="${{ gitea.ref }}"
case "$REF" in
refs/heads/main|refs/heads/master) ENV_TAG="prod" ;;
refs/heads/staging) ENV_TAG="staging" ;;
refs/heads/dev) ENV_TAG="dev" ;;
*) echo "Branch not mapped to environment, skipping"; exit 0 ;;
esac
git clone https://${{ secrets.GIT_USER }}:${{ secrets.GIT_TOKEN }}@git.wectrl.net/${{ inputs.k8s-repo }}.git
cd wectrl-k8s-cluster
git config user.email "ci@wectrl.net"
git config user.name "Gitea CI"
for DEPLOY_PATH in ${{ inputs.deploy-paths }}; do
yq -i '.spec.template.metadata.annotations."deploy.wectrl.net/restart" = "'"${TIMESTAMP}-sha-${SHORT_SHA}"'"' \
"${DEPLOY_PATH}"
git add "${DEPLOY_PATH}"
done
if git diff --staged --quiet; then
echo "No annotation changes to commit"
else
git commit -m "deploy: ${{ inputs.service-name }} ${ENV_TAG} (sha-${SHORT_SHA})"
git push origin main
echo "Annotation bumped — ArgoCD will roll pods within ~3 min"
fi