C1: migrate cv + docs from minikube to indri-native (#342)
## Summary
Replace the cv (`cv.eblu.me`) and docs (`docs.eblu.me`) minikube Deployments with indri-native ansible roles. Caddy serves the extracted release tarballs directly via a new `kind: static` service-block — no daemon, no nginx pod, no ProxyGroup ingress on the request path. Mirrors the rationale of the recent devpi migration; part of the broader minikube wind-down.
## What's in this commit
- `ansible/roles/{cv,docs}` — sentinel-gated tarball download + extract into `~/{cv,docs}/content/`
- `ansible/roles/caddy/` — new `kind: static` branch in the Caddyfile template (encoded gzip, immutable cache headers for fingerprinted assets, optional `try_html` for Quartz-style clean URLs, optional per-path `download_paths` for the resume PDF's `Content-Disposition`)
- `ansible/playbooks/indri.yml` — wires `cv` and `docs` roles before `caddy`
- `service-versions.yaml` — both services flip to `type: ansible`. `docs.current-version` stays at `1.28.2` for this commit so `container-version-check` keeps passing while `containers/quartz/Dockerfile` still exists; it moves to the docs release tag in the cleanup commit
- `.forgejo/workflows/{cv-deploy,build-blumeops}.yaml` — deploy step now bumps `cv_version`/`docs_version` in the role defaults and pushes; running ansible + purging the Fly cache is manual from gilbert (matches devpi)
- Docs: `docs/how-to/operations/{cv,docs}-on-indri.md`, updated `docs/reference/services/{cv,docs}.md`, changelog fragment
## What is not in this commit
The dead artifacts. After PR review and successful cutover, a follow-up commit deletes:
- `argocd/apps/{cv,docs}.yaml` and `argocd/manifests/{cv,docs}/`
- `containers/cv/`, `containers/quartz/`
- `CONTAINER_TO_SERVICE['quartz']` mapping in `mise-tasks/container-version-check`
- bumps `docs.current-version` in `service-versions.yaml` to the release tag
## Cutover plan (manual, from gilbert, after review)
1. **Take down old:**
- Remove the cv and docs Applications: `argocd app delete cv --cascade && argocd app delete docs --cascade`
- Verify k8s namespaces gone: `kubectl --context=minikube-indri get ns | grep -E '^(cv|docs)\\b'` (should be empty)
- Verify tailnet MagicDNS no longer advertises the VIPs: `nslookup cv.tail8d86e.ts.net` and `nslookup docs.tail8d86e.ts.net` should both fail
2. **Bring up new:**
- `mise run provision-indri -- --tags cv,docs,caddy --check --diff` (already validated on branch)
- `mise run provision-indri -- --tags cv,docs,caddy`
- `fly ssh console -a blumeops-proxy -C "sh -c 'rm -rf /tmp/cache && nginx -s reload'"`
3. **Verify:** `mise run services-check` and the curl checks listed in `docs/how-to/operations/{cv,docs}-on-indri.md`
4. **Cleanup commit + merge.**
Total expected downtime: minutes (not the few-hour budget you authorized).
## Test plan
- [ ] `mise run provision-indri -- --tags cv,docs --check --diff` clean
- [ ] `mise run provision-indri -- --tags caddy --check --diff` shows only the cv + docs blocks changing as previewed in the PR thread
- [ ] After cutover: `cv.eblu.me`, `cv.ops.eblu.me`, `docs.eblu.me`, `docs.ops.eblu.me` all return 200
- [ ] `cv.eblu.me/resume.pdf` includes `Content-Disposition: attachment`
- [ ] A clean Quartz URL (e.g. `docs.eblu.me/explanation/agent-change-process`) resolves to the right page
- [ ] `mise run services-check` clean
- [ ] `mise run service-review --type ansible` shows cv and docs
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Reviewed-on: #342
This commit is contained in:
parent
a529d60f60
commit
8d634861f6
16 changed files with 415 additions and 136 deletions
|
|
@ -256,5 +256,9 @@
|
|||
tags: jellyfin_metrics
|
||||
- role: forgejo_metrics
|
||||
tags: forgejo_metrics
|
||||
- role: cv
|
||||
tags: cv
|
||||
- role: docs
|
||||
tags: docs
|
||||
- role: caddy
|
||||
tags: caddy
|
||||
|
|
|
|||
|
|
@ -72,10 +72,16 @@ caddy_services:
|
|||
backend: "https://go.tail8d86e.ts.net"
|
||||
- name: docs
|
||||
host: "docs.{{ caddy_domain }}"
|
||||
backend: "https://docs.tail8d86e.ts.net"
|
||||
kind: static
|
||||
root: "{{ docs_content_dir }}"
|
||||
try_html: true # Quartz: path → path/ → path.html → 404.html
|
||||
- name: cv
|
||||
host: "cv.{{ caddy_domain }}"
|
||||
backend: "https://cv.tail8d86e.ts.net"
|
||||
kind: static
|
||||
root: "{{ cv_content_dir }}"
|
||||
download_paths:
|
||||
- path: /resume.pdf
|
||||
filename: erich-blume-resume.pdf
|
||||
- name: nvr
|
||||
host: "nvr.{{ caddy_domain }}"
|
||||
backend: "https://nvr.tail8d86e.ts.net"
|
||||
|
|
|
|||
|
|
@ -31,6 +31,25 @@
|
|||
{% for service in caddy_services %}
|
||||
@{{ service.name }} host {{ service.host }}
|
||||
handle @{{ service.name }} {
|
||||
{% if service.kind | default('proxy') == 'static' %}
|
||||
root * {{ service.root }}
|
||||
encode gzip
|
||||
# Long-cache fingerprinted assets; everything else stays default.
|
||||
@{{ service.name }}_assets path_regexp \.(css|js|png|jpg|jpeg|gif|ico|svg|woff|woff2)$
|
||||
header @{{ service.name }}_assets Cache-Control "public, max-age=31536000, immutable"
|
||||
{% for dl in service.download_paths | default([]) %}
|
||||
@{{ service.name }}_dl{{ loop.index }} path {{ dl.path }}
|
||||
header @{{ service.name }}_dl{{ loop.index }} Content-Disposition `attachment; filename="{{ dl.filename }}"`
|
||||
{% endfor %}
|
||||
{% if service.try_html | default(false) %}
|
||||
try_files {path} {path}/ {path}.html
|
||||
handle_errors 404 {
|
||||
rewrite * /404.html
|
||||
file_server
|
||||
}
|
||||
{% endif %}
|
||||
file_server
|
||||
{% else %}
|
||||
{% if service.cache_policy | default('') == 'spa' %}
|
||||
# SPA cache policy: hashed static assets are immutable, HTML must revalidate.
|
||||
# Prevents stale HTML from referencing chunk hashes that no longer exist.
|
||||
|
|
@ -47,6 +66,7 @@
|
|||
}
|
||||
{% else %}
|
||||
reverse_proxy {{ service.backend }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
}
|
||||
|
||||
|
|
|
|||
10
ansible/roles/cv/defaults/main.yml
Normal file
10
ansible/roles/cv/defaults/main.yml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
---
|
||||
# CV / resume static site (native, replaces minikube Deployment)
|
||||
# Caddy serves cv_content_dir directly via the static-kind service block.
|
||||
|
||||
cv_version: "v1.0.3"
|
||||
cv_release_url: "https://forge.eblu.me/api/packages/eblume/generic/cv/{{ cv_version }}/cv-{{ cv_version }}.tar.gz"
|
||||
|
||||
cv_home: /Users/erichblume/blumeops/cv
|
||||
cv_content_dir: "{{ cv_home }}/content"
|
||||
cv_version_sentinel: "{{ cv_home }}/.installed-version"
|
||||
57
ansible/roles/cv/tasks/main.yml
Normal file
57
ansible/roles/cv/tasks/main.yml
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
---
|
||||
# cv role — download and extract the CV release tarball into cv_content_dir.
|
||||
# Caddy serves the directory directly; there is no daemon to manage.
|
||||
#
|
||||
# Idempotency: a sentinel file records the installed cv_version. The
|
||||
# download/extract steps only run when the sentinel doesn't match cv_version.
|
||||
#
|
||||
# We use curl rather than ansible.builtin.get_url because the forge generic-
|
||||
# packages endpoint returns 405 on HEAD requests, which get_url issues before
|
||||
# downloading.
|
||||
|
||||
- name: Ensure cv home exists
|
||||
ansible.builtin.file:
|
||||
path: "{{ cv_home }}"
|
||||
state: directory
|
||||
mode: '0755'
|
||||
|
||||
- name: Read installed cv version sentinel
|
||||
ansible.builtin.slurp:
|
||||
src: "{{ cv_version_sentinel }}"
|
||||
register: cv_installed_raw
|
||||
failed_when: false
|
||||
changed_when: false
|
||||
|
||||
- name: Set installed cv version fact
|
||||
ansible.builtin.set_fact:
|
||||
cv_installed_version: >-
|
||||
{{ (cv_installed_raw.content | b64decode).strip()
|
||||
if (cv_installed_raw.content is defined) else '' }}
|
||||
|
||||
- name: Recreate cv content dir
|
||||
ansible.builtin.file:
|
||||
path: "{{ cv_content_dir }}"
|
||||
state: "{{ item }}"
|
||||
mode: '0755'
|
||||
loop:
|
||||
- absent
|
||||
- directory
|
||||
when: cv_installed_version != cv_version
|
||||
|
||||
- name: Download and extract cv release tarball
|
||||
ansible.builtin.shell:
|
||||
cmd: >-
|
||||
set -euo pipefail;
|
||||
curl -fsSL {{ cv_release_url | quote }} -o {{ cv_home }}/cv.tar.gz &&
|
||||
tar -xzf {{ cv_home }}/cv.tar.gz -C {{ cv_content_dir }} &&
|
||||
rm -f {{ cv_home }}/cv.tar.gz
|
||||
executable: /bin/bash
|
||||
when: cv_installed_version != cv_version
|
||||
changed_when: true
|
||||
|
||||
- name: Write cv version sentinel
|
||||
ansible.builtin.copy:
|
||||
content: "{{ cv_version }}\n"
|
||||
dest: "{{ cv_version_sentinel }}"
|
||||
mode: '0644'
|
||||
when: cv_installed_version != cv_version
|
||||
11
ansible/roles/docs/defaults/main.yml
Normal file
11
ansible/roles/docs/defaults/main.yml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
---
|
||||
# Docs (Quartz-built static site) — replaces minikube Deployment.
|
||||
# Caddy serves docs_content_dir directly via the static-kind service block,
|
||||
# with Quartz-style try_files (path → path/ → path.html → 404).
|
||||
|
||||
docs_version: "v1.16.0"
|
||||
docs_release_url: "https://forge.eblu.me/eblume/blumeops/releases/download/{{ docs_version }}/docs-{{ docs_version }}.tar.gz"
|
||||
|
||||
docs_home: /Users/erichblume/blumeops/docs
|
||||
docs_content_dir: "{{ docs_home }}/content"
|
||||
docs_version_sentinel: "{{ docs_home }}/.installed-version"
|
||||
57
ansible/roles/docs/tasks/main.yml
Normal file
57
ansible/roles/docs/tasks/main.yml
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
---
|
||||
# docs role — download and extract the Quartz-built docs tarball into
|
||||
# docs_content_dir. Caddy serves the directory directly with Quartz-style
|
||||
# try_files; there is no daemon to manage.
|
||||
#
|
||||
# Idempotency: a sentinel file records the installed docs_version. The
|
||||
# download/extract steps only run when the sentinel doesn't match docs_version.
|
||||
#
|
||||
# Mirrors the cv role's curl-based download for consistency, even though the
|
||||
# forge releases endpoint here does support HEAD.
|
||||
|
||||
- name: Ensure docs home exists
|
||||
ansible.builtin.file:
|
||||
path: "{{ docs_home }}"
|
||||
state: directory
|
||||
mode: '0755'
|
||||
|
||||
- name: Read installed docs version sentinel
|
||||
ansible.builtin.slurp:
|
||||
src: "{{ docs_version_sentinel }}"
|
||||
register: docs_installed_raw
|
||||
failed_when: false
|
||||
changed_when: false
|
||||
|
||||
- name: Set installed docs version fact
|
||||
ansible.builtin.set_fact:
|
||||
docs_installed_version: >-
|
||||
{{ (docs_installed_raw.content | b64decode).strip()
|
||||
if (docs_installed_raw.content is defined) else '' }}
|
||||
|
||||
- name: Recreate docs content dir
|
||||
ansible.builtin.file:
|
||||
path: "{{ docs_content_dir }}"
|
||||
state: "{{ item }}"
|
||||
mode: '0755'
|
||||
loop:
|
||||
- absent
|
||||
- directory
|
||||
when: docs_installed_version != docs_version
|
||||
|
||||
- name: Download and extract docs release tarball
|
||||
ansible.builtin.shell:
|
||||
cmd: >-
|
||||
set -euo pipefail;
|
||||
curl -fsSL {{ docs_release_url | quote }} -o {{ docs_home }}/docs.tar.gz &&
|
||||
tar -xzf {{ docs_home }}/docs.tar.gz -C {{ docs_content_dir }} &&
|
||||
rm -f {{ docs_home }}/docs.tar.gz
|
||||
executable: /bin/bash
|
||||
when: docs_installed_version != docs_version
|
||||
changed_when: true
|
||||
|
||||
- name: Write docs version sentinel
|
||||
ansible.builtin.copy:
|
||||
content: "{{ docs_version }}\n"
|
||||
dest: "{{ docs_version_sentinel }}"
|
||||
mode: '0644'
|
||||
when: docs_installed_version != docs_version
|
||||
Loading…
Add table
Add a link
Reference in a new issue