Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
038cf40fe5 | ||
|
|
fcf60cc546 | ||
|
|
8f197fcc23 | ||
|
|
f253731cb9 | ||
|
|
32ef4eae0e | ||
|
|
f521763292 | ||
|
|
326be2e057 | ||
|
|
913cfc2f40 | ||
|
|
6b7e556d81 | ||
|
|
6ecef14d0e | ||
|
|
709b8b7039 | ||
|
|
39e2ed504c | ||
|
|
4d60684ca0 | ||
|
|
b098d6a473 | ||
|
|
caf0b5bfe6 | ||
|
|
0e02cafdd7 | ||
|
|
1e84f13009 | ||
|
|
0e63d208d1 | ||
|
|
cdd0ba2c99 |
@@ -0,0 +1,93 @@
|
|||||||
|
name: Build & Push Runner Images
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
workflow_dispatch: # Manual trigger
|
||||||
|
schedule:
|
||||||
|
- cron: '0 2 * * 0' # Weekly on Sunday 2 AM UTC (ensure fresh images)
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: forgejo.riotpiao.com
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-runner-images:
|
||||||
|
name: Build & Push All Runner Images
|
||||||
|
runs-on: golang
|
||||||
|
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 and push Golang runner image
|
||||||
|
run: |
|
||||||
|
IMAGE="${REGISTRY}/rock/forgejo-runner-golang"
|
||||||
|
echo "Building: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
|
||||||
|
docker build --no-cache \
|
||||||
|
-f k8s/infra/forgejo-runner-images/Dockerfile.golang \
|
||||||
|
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||||
|
-t "${IMAGE}:latest" \
|
||||||
|
.
|
||||||
|
|
||||||
|
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
docker push "${IMAGE}:latest"
|
||||||
|
echo "✓ Pushed golang runner"
|
||||||
|
|
||||||
|
- name: Build and push Node runner image
|
||||||
|
run: |
|
||||||
|
IMAGE="${REGISTRY}/rock/forgejo-runner-node"
|
||||||
|
echo "Building: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
|
||||||
|
docker build --no-cache \
|
||||||
|
-f k8s/infra/forgejo-runner-images/Dockerfile.node \
|
||||||
|
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||||
|
-t "${IMAGE}:latest" \
|
||||||
|
.
|
||||||
|
|
||||||
|
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
docker push "${IMAGE}:latest"
|
||||||
|
echo "✓ Pushed node runner"
|
||||||
|
|
||||||
|
- name: Build and push Rust runner image
|
||||||
|
run: |
|
||||||
|
IMAGE="${REGISTRY}/rock/forgejo-runner-rust"
|
||||||
|
echo "Building: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
|
||||||
|
docker build --no-cache \
|
||||||
|
-f k8s/infra/forgejo-runner-images/Dockerfile.rust \
|
||||||
|
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||||
|
-t "${IMAGE}:latest" \
|
||||||
|
.
|
||||||
|
|
||||||
|
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
docker push "${IMAGE}:latest"
|
||||||
|
echo "✓ Pushed rust runner"
|
||||||
|
|
||||||
|
- name: Prune unused images
|
||||||
|
run: docker image prune -a --force 2>&1 | tail -3 || true
|
||||||
|
|
||||||
|
- name: Summary
|
||||||
|
run: |
|
||||||
|
echo "=== Runner Images Built and Pushed ==="
|
||||||
|
echo "✓ forgejo.riotpiao.com/rock/forgejo-runner-golang:latest"
|
||||||
|
echo "✓ forgejo.riotpiao.com/rock/forgejo-runner-node:latest"
|
||||||
|
echo "✓ forgejo.riotpiao.com/rock/forgejo-runner-rust:latest"
|
||||||
@@ -14,6 +14,5 @@ resources:
|
|||||||
- ornith.yaml
|
- ornith.yaml
|
||||||
- reasoning.yaml
|
- reasoning.yaml
|
||||||
- reranker.yaml
|
- reranker.yaml
|
||||||
- networkpolicy.yaml
|
|
||||||
# No namespace transformer: every file sets its own, and the transformer would
|
# No namespace transformer: every file sets its own, and the transformer would
|
||||||
# rewrite metadata.namespace on anything cross-namespace added later.
|
# rewrite metadata.namespace on anything cross-namespace added later.
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
# 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.argoproj.io/sync-wave: "7"
|
||||||
# ArgoCD Image Updater - auto-update on new image push
|
# 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/image-list: gw=forgejo.riotpiao.com/rock/api-gateway
|
||||||
argocd-image-updater.argoproj.io/gw.update-strategy: digest
|
argocd-image-updater.argoproj.io/gw.update-strategy: newest-build
|
||||||
argocd-image-updater.argoproj.io/gw.allow-tags: regexp:^latest$
|
argocd-image-updater.argoproj.io/gw.allow-tags: regexp:^[0-9a-f]{7}$
|
||||||
argocd-image-updater.argoproj.io/write-back-method: argocd
|
argocd-image-updater.argoproj.io/write-back-method: argocd
|
||||||
spec:
|
spec:
|
||||||
project: homelab
|
project: homelab
|
||||||
|
|||||||
@@ -248,8 +248,8 @@ metadata:
|
|||||||
argocd.argoproj.io/sync-wave: "8"
|
argocd.argoproj.io/sync-wave: "8"
|
||||||
# ArgoCD Image Updater - auto-update on new image push
|
# 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/image-list: app=forgejo.riotpiao.com/rock/portfolio
|
||||||
argocd-image-updater.argoproj.io/app.update-strategy: digest
|
argocd-image-updater.argoproj.io/app.update-strategy: newest-build
|
||||||
argocd-image-updater.argoproj.io/app.allow-tags: regexp:^latest$
|
argocd-image-updater.argoproj.io/app.allow-tags: regexp:^[0-9a-f]{7}$
|
||||||
argocd-image-updater.argoproj.io/write-back-method: argocd
|
argocd-image-updater.argoproj.io/write-back-method: argocd
|
||||||
spec:
|
spec:
|
||||||
project: homelab
|
project: homelab
|
||||||
|
|||||||
@@ -10,13 +10,14 @@ metadata:
|
|||||||
memory=forgejo.riotpiao.com/rock/poimen-memory
|
memory=forgejo.riotpiao.com/rock/poimen-memory
|
||||||
workflows=forgejo.riotpiao.com/rock/poimen-workflows
|
workflows=forgejo.riotpiao.com/rock/poimen-workflows
|
||||||
frontend=forgejo.riotpiao.com/rock/poimen-frontend
|
frontend=forgejo.riotpiao.com/rock/poimen-frontend
|
||||||
argocd-image-updater.argoproj.io/memory.update-strategy: digest
|
argocd-image-updater.argoproj.io/memory.update-strategy: newest-build
|
||||||
argocd-image-updater.argoproj.io/memory.allow-tags: regexp:^latest$
|
argocd-image-updater.argoproj.io/memory.allow-tags: regexp:^[0-9a-f]{7}$
|
||||||
argocd-image-updater.argoproj.io/workflows.update-strategy: digest
|
argocd-image-updater.argoproj.io/workflows.update-strategy: newest-build
|
||||||
argocd-image-updater.argoproj.io/workflows.allow-tags: regexp:^latest$
|
argocd-image-updater.argoproj.io/workflows.allow-tags: regexp:^[0-9a-f]{7}$
|
||||||
argocd-image-updater.argoproj.io/frontend.update-strategy: digest
|
argocd-image-updater.argoproj.io/frontend.update-strategy: newest-build
|
||||||
argocd-image-updater.argoproj.io/frontend.allow-tags: regexp:^latest$
|
argocd-image-updater.argoproj.io/frontend.allow-tags: regexp:^[0-9a-f]{7}$
|
||||||
argocd-image-updater.argoproj.io/write-back-method: argocd
|
argocd-image-updater.argoproj.io/write-back-method: git
|
||||||
|
argocd-image-updater.argoproj.io/git-branch: main
|
||||||
spec:
|
spec:
|
||||||
project: homelab
|
project: homelab
|
||||||
sources:
|
sources:
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
FROM golang:1.26-bookworm
|
||||||
|
|
||||||
|
# Install Node.js, npm, and Docker CLI
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
nodejs npm docker.io \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Verify installations
|
||||||
|
RUN go version && node --version && npm --version && docker --version
|
||||||
|
|
||||||
|
LABEL maintainer="homelab" \
|
||||||
|
description="Golang 1.26 + Node.js + Docker CLI pre-installed"
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
FROM node:22-bookworm
|
||||||
|
|
||||||
|
# Node.js already installed, add Docker CLI
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
docker.io \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Verify installations
|
||||||
|
RUN node --version && npm --version && docker --version
|
||||||
|
|
||||||
|
LABEL maintainer="homelab" \
|
||||||
|
description="Node.js 22 + Docker CLI pre-installed"
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
FROM rust:1-bookworm
|
||||||
|
|
||||||
|
# Add Node.js and Docker CLI
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
nodejs npm docker.io \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Verify installations
|
||||||
|
RUN rustc --version && cargo --version && node --version && npm --version && docker --version
|
||||||
|
|
||||||
|
LABEL maintainer="homelab" \
|
||||||
|
description="Rust 1 + Node.js + Docker CLI pre-installed"
|
||||||
@@ -60,11 +60,15 @@ spec:
|
|||||||
containers:
|
containers:
|
||||||
- name: runner
|
- name: runner
|
||||||
image: {{ .Values.runner.image.repository }}:{{ .Values.runner.image.tag }}
|
image: {{ .Values.runner.image.repository }}:{{ .Values.runner.image.tag }}
|
||||||
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"]
|
command: ["sh", "-c", "forgejo-runner daemon --config /etc/forgejo-runner/config.yaml"]
|
||||||
workingDir: /data
|
workingDir: /data
|
||||||
env:
|
env:
|
||||||
- name: DOCKER_HOST
|
- name: DOCKER_HOST
|
||||||
value: tcp://localhost:2375
|
value: tcp://localhost:2376
|
||||||
|
- name: DOCKER_TLS_VERIFY
|
||||||
|
value: "1"
|
||||||
|
- name: DOCKER_CERT_PATH
|
||||||
|
value: /docker-certs/client
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: runner-data
|
- name: runner-data
|
||||||
mountPath: /data
|
mountPath: /data
|
||||||
@@ -87,7 +91,7 @@ spec:
|
|||||||
privileged: true # required for DinD; cicd namespace is labelled privileged
|
privileged: true # required for DinD; cicd namespace is labelled privileged
|
||||||
env:
|
env:
|
||||||
- name: DOCKER_TLS_CERTDIR
|
- name: DOCKER_TLS_CERTDIR
|
||||||
value: ""
|
value: /docker-certs
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: docker-certs
|
- name: docker-certs
|
||||||
mountPath: /docker-certs
|
mountPath: /docker-certs
|
||||||
|
|||||||
Reference in New Issue
Block a user