Compare commits
9
Commits
ad1ce5e4aa
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9fe867e84f | ||
|
|
8983720d3a | ||
|
|
f13ee1ba21 | ||
|
|
99bd163f0b | ||
|
|
e28e3cae81 | ||
|
|
febfb055ae | ||
|
|
9d61c42b99 | ||
|
|
594e752d47 | ||
|
|
1a8e87131b |
@@ -208,3 +208,95 @@ versions without warning in your own values file.
|
||||
Grouping by layer (rather than by day or by "misc fixes") makes it much
|
||||
easier to `git log --oneline -- <path>` your way back to *why* a given
|
||||
piece of config looks the way it does, months later.
|
||||
|
||||
## Unified Forgejo CI Workflow Pattern (Enforced 2026-09-07+)
|
||||
|
||||
All repositories MUST follow this exact structure. No variations.
|
||||
|
||||
```yaml
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
|
||||
env:
|
||||
REGISTRY: <your-registry-hostname>
|
||||
IMAGE: <registry>/<org>/<service-name>
|
||||
|
||||
jobs:
|
||||
test:
|
||||
name: Test
|
||||
runs-on: [golang|node|rust]
|
||||
steps:
|
||||
- name: Install Node.js for actions runtime
|
||||
run: apt-get update && apt-get install -y nodejs
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Language-specific tests here (no docker, no registry)
|
||||
# - name: Run tests
|
||||
# run: npm test -- --run || true
|
||||
|
||||
build-push:
|
||||
name: Build & Push Image
|
||||
needs: test
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
runs-on: [golang|node|rust]
|
||||
steps:
|
||||
- name: Install Node.js and Docker
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y nodejs docker.io
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Get short SHA
|
||||
id: sha
|
||||
run: |
|
||||
SHORT_SHA=$(git rev-parse --short HEAD)
|
||||
echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Registry login
|
||||
run: |
|
||||
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
|
||||
--username "${REGISTRY_USER}" --password-stdin
|
||||
env:
|
||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
docker build --no-cache \
|
||||
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||
-t "${IMAGE}:latest" \
|
||||
.
|
||||
|
||||
- name: Push Docker image
|
||||
run: |
|
||||
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
docker push "${IMAGE}:latest"
|
||||
|
||||
- name: Prune unused images
|
||||
run: docker image prune -a --force 2>&1 | tail -3 || true
|
||||
```
|
||||
|
||||
### Anti-Patterns (DO NOT USE)
|
||||
|
||||
- ❌ `container: image: golang:1.26` overrides — breaks docker socket sharing
|
||||
- ❌ Conditional `if:` on individual steps — use separate jobs instead
|
||||
- ❌ Installing docker.io in test job — only needed in build-push
|
||||
- ❌ Monolithic job doing test + build + push — hard to debug
|
||||
- ❌ Using `{{ github.sha }}` for image tag — use short commit SHA for readability
|
||||
|
||||
### How It Works
|
||||
|
||||
1. **PR to feature branch** → test job runs, build-push skipped, nothing pushed
|
||||
2. **Push to main** → test runs, build-push runs after test passes, image pushed
|
||||
3. Docker socket shared between dind sidecar and runner via emptyDir mount at `/run`
|
||||
4. `docker_host: automount` in runner config injects socket into workflow containers
|
||||
5. Secrets (FORGEJO_REGISTRY_USER, TOKEN) set in Forgejo repo settings, NOT in git
|
||||
|
||||
@@ -14,5 +14,6 @@ resources:
|
||||
- ornith.yaml
|
||||
- reasoning.yaml
|
||||
- reranker.yaml
|
||||
- networkpolicy.yaml
|
||||
# No namespace transformer: every file sets its own, and the transformer would
|
||||
# rewrite metadata.namespace on anything cross-namespace added later.
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
# NetworkPolicy for LLM inference engines (llm-serving namespace).
|
||||
#
|
||||
# These pods have NO auth — vLLM, Ollama, and TEI accept any request.
|
||||
# All access MUST go through the api-gateway, which validates JWTs and
|
||||
# injects identity headers (X-Forwarded-User, X-Auth-Verified).
|
||||
#
|
||||
# Replaces the hand-applied llm-serving-default-deny policy that used
|
||||
# `llm-client: "true"` pod label as a selector — any pod in any namespace
|
||||
# could self-grant access by adding that label, which defeats the purpose.
|
||||
#
|
||||
# This policy restricts ingress to:
|
||||
# 1. api namespace (gateway) — the sole entry point for inference
|
||||
# 2. monitoring namespace — Prometheus scraping vLLM/TEI /metrics
|
||||
# 3. intra-namespace — pod-to-pod (future: multi-replica comms)
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: NetworkPolicy
|
||||
metadata:
|
||||
name: llm-serving-ingress
|
||||
namespace: llm-serving
|
||||
labels:
|
||||
app.kubernetes.io/part-of: llm-serving
|
||||
spec:
|
||||
podSelector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/part-of: llm-serving
|
||||
policyTypes:
|
||||
- Ingress
|
||||
ingress:
|
||||
# Allow from api-gateway (namespace: api)
|
||||
# Gateway proxies /v1/chat/completions, /v1/embeddings, /v1/rerank
|
||||
- from:
|
||||
- namespaceSelector:
|
||||
matchLabels:
|
||||
kubernetes.io/metadata.name: api
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 8080 # vLLM, Ollama HTTP
|
||||
- protocol: TCP
|
||||
port: 80 # KServe predictor services
|
||||
- protocol: TCP
|
||||
port: 8000 # vLLM direct (some configs)
|
||||
- protocol: TCP
|
||||
port: 11434 # Ollama native port
|
||||
# Allow Prometheus scraping from monitoring namespace
|
||||
# vLLM: :8080/metrics, TEI: :9000/metrics
|
||||
- from:
|
||||
- namespaceSelector:
|
||||
matchLabels:
|
||||
kubernetes.io/metadata.name: monitoring
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 8080
|
||||
- protocol: TCP
|
||||
port: 9000
|
||||
# Allow intra-namespace (pod-to-pod within llm-serving)
|
||||
- from:
|
||||
- podSelector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/part-of: llm-serving
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 8080
|
||||
@@ -38,8 +38,8 @@ metadata:
|
||||
argocd.argoproj.io/sync-wave: "7"
|
||||
# ArgoCD Image Updater - auto-update on new image push
|
||||
argocd-image-updater.argoproj.io/image-list: gw=forgejo.riotpiao.com/rock/api-gateway
|
||||
argocd-image-updater.argoproj.io/gw.update-strategy: newest-build
|
||||
argocd-image-updater.argoproj.io/gw.allow-tags: regexp:^[0-9a-f]{7}$
|
||||
argocd-image-updater.argoproj.io/gw.update-strategy: digest
|
||||
argocd-image-updater.argoproj.io/gw.allow-tags: regexp:^latest$
|
||||
argocd-image-updater.argoproj.io/write-back-method: argocd
|
||||
spec:
|
||||
project: homelab
|
||||
|
||||
@@ -248,8 +248,8 @@ metadata:
|
||||
argocd.argoproj.io/sync-wave: "8"
|
||||
# ArgoCD Image Updater - auto-update on new image push
|
||||
argocd-image-updater.argoproj.io/image-list: app=forgejo.riotpiao.com/rock/portfolio
|
||||
argocd-image-updater.argoproj.io/app.update-strategy: newest-build
|
||||
argocd-image-updater.argoproj.io/app.allow-tags: regexp:^[0-9a-f]{7}$
|
||||
argocd-image-updater.argoproj.io/app.update-strategy: digest
|
||||
argocd-image-updater.argoproj.io/app.allow-tags: regexp:^latest$
|
||||
argocd-image-updater.argoproj.io/write-back-method: argocd
|
||||
spec:
|
||||
project: homelab
|
||||
|
||||
@@ -10,14 +10,13 @@ metadata:
|
||||
memory=forgejo.riotpiao.com/rock/poimen-memory
|
||||
workflows=forgejo.riotpiao.com/rock/poimen-workflows
|
||||
frontend=forgejo.riotpiao.com/rock/poimen-frontend
|
||||
argocd-image-updater.argoproj.io/memory.update-strategy: newest-build
|
||||
argocd-image-updater.argoproj.io/memory.allow-tags: regexp:^[0-9a-f]{7}$
|
||||
argocd-image-updater.argoproj.io/workflows.update-strategy: newest-build
|
||||
argocd-image-updater.argoproj.io/workflows.allow-tags: regexp:^[0-9a-f]{7}$
|
||||
argocd-image-updater.argoproj.io/frontend.update-strategy: newest-build
|
||||
argocd-image-updater.argoproj.io/frontend.allow-tags: regexp:^[0-9a-f]{7}$
|
||||
argocd-image-updater.argoproj.io/write-back-method: git
|
||||
argocd-image-updater.argoproj.io/git-branch: main
|
||||
argocd-image-updater.argoproj.io/memory.update-strategy: digest
|
||||
argocd-image-updater.argoproj.io/memory.allow-tags: regexp:^latest$
|
||||
argocd-image-updater.argoproj.io/workflows.update-strategy: digest
|
||||
argocd-image-updater.argoproj.io/workflows.allow-tags: regexp:^latest$
|
||||
argocd-image-updater.argoproj.io/frontend.update-strategy: digest
|
||||
argocd-image-updater.argoproj.io/frontend.allow-tags: regexp:^latest$
|
||||
argocd-image-updater.argoproj.io/write-back-method: argocd
|
||||
spec:
|
||||
project: homelab
|
||||
sources:
|
||||
|
||||
@@ -60,15 +60,11 @@ spec:
|
||||
containers:
|
||||
- name: runner
|
||||
image: {{ .Values.runner.image.repository }}:{{ .Values.runner.image.tag }}
|
||||
command: ["sh", "-c", "forgejo-runner daemon --config /etc/forgejo-runner/config.yaml"]
|
||||
command: ["sh", "-c", "while ! wget -q -O- http://localhost:2375/_ping >/dev/null 2>&1; do echo 'waiting for dind...'; sleep 2; done; echo 'dind ready'; forgejo-runner daemon --config /etc/forgejo-runner/config.yaml"]
|
||||
workingDir: /data
|
||||
env:
|
||||
- name: DOCKER_HOST
|
||||
value: tcp://localhost:2376
|
||||
- name: DOCKER_TLS_VERIFY
|
||||
value: "1"
|
||||
- name: DOCKER_CERT_PATH
|
||||
value: /docker-certs/client
|
||||
value: tcp://localhost:2375
|
||||
volumeMounts:
|
||||
- name: runner-data
|
||||
mountPath: /data
|
||||
@@ -91,7 +87,7 @@ spec:
|
||||
privileged: true # required for DinD; cicd namespace is labelled privileged
|
||||
env:
|
||||
- name: DOCKER_TLS_CERTDIR
|
||||
value: /docker-certs
|
||||
value: ""
|
||||
volumeMounts:
|
||||
- name: docker-certs
|
||||
mountPath: /docker-certs
|
||||
|
||||
@@ -5,7 +5,7 @@ runner:
|
||||
name: golang-runner
|
||||
# Label image is what workflow steps run in (NOT the runner daemon image).
|
||||
# golang:1.26-bookworm: Debian, root, apt-get, Go, git.
|
||||
# Install Node.js/docker in workflow steps as needed.
|
||||
# TODO: Switch to custom image once build-runner-images.yml pushes images
|
||||
labels: "golang:docker://golang:1.26-bookworm"
|
||||
forgejoUrl: http://forgejo-gitea-http.cicd.svc.cluster.local:3000
|
||||
tokenSecret: runner-token
|
||||
|
||||
Reference in New Issue
Block a user