Compare commits

...

2 Commits

Author SHA1 Message Date
b9f2c72bd4 deploy: private package pull via External Secrets; pull over public HTTPS (no k3s restart)
All checks were successful
CI / ci (push) Successful in 1m55s
- k3s pulls git.7tl-homelab.com/... over valid TLS (no registries.yaml/node config)
- CI still pushes internally to 10.66.15.22:3000 (fast, insecure-trusted)
- ExternalSecret materializes gitea-registry dockerconfigjson from OpenBao
- deployment uses imagePullSecrets: gitea-registry
- .env added to .dockerignore
2026-07-17 07:36:22 -04:00
466a01f217 ci: drop Playwright e2e from CI (run locally); keep build + seo:lint 2026-07-17 07:33:42 -04:00
5 changed files with 56 additions and 23 deletions

View File

@ -8,3 +8,5 @@ README.md
docs
k8s
.DS_Store
.env
.env.*

View File

@ -27,7 +27,11 @@ on:
- '**/*.md'
env:
IMAGE: 10.66.15.22:3000/bmr_bluecap/bcs-website
# Push over the internal HTTP endpoint (fast, no edge; host dockerd trusts it as insecure).
PUSH_IMAGE: 10.66.15.22:3000/bmr_bluecap/bcs-website
# k3s pulls over the public HTTPS endpoint (valid TLS -> no registries.yaml / node config / restart).
# Same Gitea package as PUSH_IMAGE, just a different access path.
DEPLOY_IMAGE: git.7tl-homelab.com/bmr_bluecap/bcs-website
jobs:
ci:
@ -50,10 +54,8 @@ jobs:
- name: SEO lint
run: npm run seo:lint
- name: End-to-end tests
run: |
npx playwright install --with-deps chromium
npm run test:e2e
# Playwright e2e (headless Chrome) is intentionally NOT run in CI — it's the heaviest step and
# adds little for a static site over `astro build` + seo:lint. Run it locally: `npm run test:e2e`.
- name: Compute image tag
id: tag
@ -72,7 +74,7 @@ jobs:
- name: Build & push image to Gitea Packages
run: |
echo "${{ secrets.CI_TOKEN }}" | docker login 10.66.15.22:3000 -u "${{ github.repository_owner }}" --password-stdin
docker build -t "$IMAGE:${{ steps.tag.outputs.sha }}" -t "$IMAGE:latest" .
docker build -t "$PUSH_IMAGE:${{ steps.tag.outputs.sha }}" -t "$PUSH_IMAGE:latest" .
# Registry pushes can time out on a slow blob; docker push is resumable, so retry.
push_retry() {
for i in 1 2 3 4 5; do
@ -82,14 +84,15 @@ jobs:
done
return 1
}
push_retry "$IMAGE:${{ steps.tag.outputs.sha }}"
push_retry "$IMAGE:latest"
push_retry "$PUSH_IMAGE:${{ steps.tag.outputs.sha }}"
push_retry "$PUSH_IMAGE:latest"
- name: Bump k8s image tag and commit back
run: |
git config user.name "gitea-actions[bot]"
git config user.email "gitea-actions@bmr_bluecap"
(cd k8s && kustomize edit set image "$IMAGE=$IMAGE:${{ steps.tag.outputs.sha }}")
# Deployment references the public HTTPS image (what k3s pulls); bump its tag.
(cd k8s && kustomize edit set image "$DEPLOY_IMAGE=$DEPLOY_IMAGE:${{ steps.tag.outputs.sha }}")
git add k8s/kustomization.yaml
git diff --cached --quiet && { echo "no image change"; exit 0; }
git commit -m "ci: deploy ${{ steps.tag.outputs.sha }} [skip ci]"

View File

@ -13,14 +13,15 @@ spec:
labels:
app: bluecap-website
spec:
# If the Gitea package is PRIVATE, create a docker-registry secret (ideally via
# External Secrets) named `gitea-registry` in this namespace and uncomment:
# imagePullSecrets:
# - name: gitea-registry
# Private Gitea package -> pull auth from the External-Secrets-managed dockerconfigjson
# (see k8s/externalsecret-registry.yaml).
imagePullSecrets:
- name: gitea-registry
containers:
- name: website
# Tag is managed by CI via kustomize (see k8s/kustomization.yaml `images`).
image: 10.66.15.22:3000/bmr_bluecap/bcs-website:latest
# Pulled over public HTTPS (valid cert -> no node registry config). Tag managed by CI
# via kustomize (see k8s/kustomization.yaml `images`).
image: git.7tl-homelab.com/bmr_bluecap/bcs-website:latest
imagePullPolicy: IfNotPresent
ports:
- name: http

View File

@ -0,0 +1,26 @@
# Materializes a docker-registry pull secret (gitea-registry) from OpenBao via the existing
# ClusterSecretStore, so the private Gitea package can be pulled by k3s without a static secret
# in Git. Store a read:package Gitea PAT in OpenBao at `cluster/bluecap-registry` with fields
# `username` (e.g. bmr_bluecap) and `password` (the token).
apiVersion: external-secrets.io/v1
kind: ExternalSecret
metadata:
name: gitea-registry
namespace: bluecap-strategies
spec:
refreshInterval: 1h
secretStoreRef:
name: openbao-cluster
kind: ClusterSecretStore
target:
name: gitea-registry
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: |
{"auths":{"git.7tl-homelab.com":{"username":"{{ .username }}","password":"{{ .password }}","auth":"{{ printf "%s:%s" .username .password | b64enc }}"}}}
data:
- secretKey: username
remoteRef: { key: bluecap-registry, property: username }
- secretKey: password
remoteRef: { key: bluecap-registry, property: password }

View File

@ -1,14 +1,15 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- namespace.yaml
- configmap.yaml
- deployment.yaml
- service.yaml
- ingress.yaml
- namespace.yaml
- configmap.yaml
- externalsecret-registry.yaml
- deployment.yaml
- service.yaml
- ingress.yaml
# CI updates newTag to the immutable git-sha via `kustomize edit set image` (see .gitea/workflows/ci.yml).
# Name is the public HTTPS pull endpoint that k3s uses.
images:
- name: 10.66.15.22:3000/bmr_bluecap/bcs-website
newName: 10.66.15.22:3000/bmr_bluecap/bcs-website
newTag: 79f2e8a78b9f
- name: git.7tl-homelab.com/bmr_bluecap/bcs-website
newTag: latest