watchstate: expose externally at watchstate.unkin.net

Add a public front door for the WatchState admin UI on watchstate.unkin.net via the external (DMZ) Traefik, alongside the existing internal watchstate.k8s.syd1.au.unkin.net gateway. oauth2-proxy fronts both hostnames. - DNSRecord watchstate-dns-internal (bind-internal/authoritative, unkin.net zone) -> A 198.18.199.0, the traefik-external VIP (arrstack precedent). - watchstate-external Gateway (traefik-external) + HTTPRoutes: http->https redirect and https -> watchstate-oauth2:80. TLS terminated with the Let's Encrypt *.unkin.net wildcard (wildcard-unkin-net-tls), so no cert-manager/external-dns annotations. - oauth2-proxy: relative redirect-url (/oauth2/callback) so reverse-proxy mode derives scheme+host per request, making the callback work on BOTH hosts; cookie + whitelist domains cover both hostnames. - Drop the no-op sync-wave: "0" annotation on the vaultauth default VaultAuth. Dependencies: - wildcard-unkin-net-tls reflection into the watchstate namespace (reflector allow-list, argocd-apps PR #418). - Both callback URIs registered on the Authentik watchstate provider (terraform-authentik, separate PR).
2026-08-26 21:44:29 +10:00
154 changed files with 248 additions and 4103 deletions
@@ -5,9 +5,7 @@ metadata:
  name: arrproxy-api
  namespace: arrstack
  annotations:
-    # Wave 2: start only after the wave-0 CNPG Cluster and VSO-synced Secrets
-    # exist. The api self-migrates at startup under a Postgres advisory lock and
-    # holds /readyz until the schema is current, so no migration ordering is needed.
+    # Wave 2: serve only after the wave-1 migrate Job completes.
    argocd.argoproj.io/sync-wave: "2"
    secret.reloader.stakater.com/reload: "arrproxy-pepper,arrproxy-admin-token,arrproxy-db-app,sonarr-adult-apikey,radarr-adult-apikey,sonarr-kids-apikey,radarr-kids-apikey"
    configmap.reloader.stakater.com/reload: "arrproxy-tiers"
@@ -36,7 +34,7 @@ spec:
          type: RuntimeDefault
      containers:
        - name: api
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/arrproxy-api:v0.6.1
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/arrproxy-api:v0.4.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 8080
@@ -5,6 +5,8 @@ kind: Kustomization
 resources:
  - cnpg_cluster.yaml
  - cnpg_backup.yaml
+  - migrations-configmap.yaml
+  - migrate-job.yaml
  - vaultstaticsecret.yaml
  - tiers-configmap.yaml
  - oauth2-proxy-configmap.yaml
@@ -0,0 +1,92 @@
+---
+# Applies the arrproxy schema once per sync, before the api rolls, so the serve
+# replicas never race migrations (arrproxy-api does not self-migrate). Runs as the
+# CNPG-minted app user so the tokens table is owned by that role.
+#
+# Sync-phase hook at wave 1 (NOT PreSync): the CNPG Cluster + generated
+# arrproxy-db-app Secret apply at wave 0 and ArgoCD waits for the Cluster to be
+# Healthy before starting wave 1, so Postgres exists before migrate connects.
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: arrproxy-migrate
+  namespace: arrstack
+  annotations:
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+    argocd.argoproj.io/sync-wave: "1"
+spec:
+  backoffLimit: 6
+  ttlSecondsAfterFinished: 600
+  template:
+    metadata:
+      labels:
+        app: arrproxy-migrate
+    spec:
+      serviceAccountName: default
+      automountServiceAccountToken: false
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65532
+        runAsGroup: 65532
+        fsGroup: 65532
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: migrate
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/postgres:18-alpine
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: HOME
+              value: /tmp
+            - name: PGUSER
+              valueFrom:
+                secretKeyRef:
+                  name: arrproxy-db-app
+                  key: username
+            - name: PGPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: arrproxy-db-app
+                  key: password
+            - name: PGHOST
+              value: arrproxy-db-rw.arrstack.svc.cluster.local
+            - name: PGPORT
+              value: "5432"
+            - name: PGDATABASE
+              value: arrproxy
+            - name: PGSSLMODE
+              value: require
+          command:
+            - psql
+            - -v
+            - ON_ERROR_STOP=1
+            - -f
+            - /migrations/0001_init.sql
+          volumeMounts:
+            - name: migrations
+              mountPath: /migrations
+              readOnly: true
+            - name: tmp
+              mountPath: /tmp
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 256Mi
+      volumes:
+        - name: migrations
+          configMap:
+            name: arrproxy-migrations
+        - name: tmp
+          emptyDir:
+            sizeLimit: 64Mi
@@ -0,0 +1,29 @@
+---
+# arrproxy schema, mirrored from the arrproxy repo migrations/0001_init.sql
+# (v0.1.0). arrproxy-api does NOT self-migrate, so the wave-1 migrate Job applies
+# this once per sync as the app user. Keep in sync with the repo on schema bumps.
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: arrproxy-migrations
+  namespace: arrstack
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+data:
+  0001_init.sql: |
+    -- arrproxy token store. Only token hashes are persisted; plaintext is shown
+    -- once at mint time and never recoverable.
+    CREATE TABLE IF NOT EXISTS tokens (
+        id           TEXT PRIMARY KEY,
+        subject      TEXT        NOT NULL,
+        label        TEXT        NOT NULL DEFAULT '',
+        token_hash   TEXT        NOT NULL UNIQUE,
+        apps         TEXT[]      NOT NULL DEFAULT '{}',
+        created_at   TIMESTAMPTZ NOT NULL DEFAULT now(),
+        expires_at   TIMESTAMPTZ,
+        disabled     BOOLEAN     NOT NULL DEFAULT false,
+        last_used_at TIMESTAMPTZ
+    );
+
+    CREATE INDEX IF NOT EXISTS tokens_subject_idx ON tokens (subject);
+    CREATE INDEX IF NOT EXISTS tokens_token_hash_idx ON tokens (token_hash);
@@ -35,7 +35,7 @@ spec:
        # identity.unkin.net serves a Vault-PKI cert; combine the system roots
        # with the internal CA so oauth2-proxy's OIDC HTTP client trusts it.
        - name: combine-certs
-          image: docker.io/library/alpine:3
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/alpine:3
          imagePullPolicy: IfNotPresent
          command:
            - sh
@@ -31,7 +31,7 @@ spec:
          type: RuntimeDefault
      containers:
        - name: ui
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/arrproxy-ui:v0.6.1
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/arrproxy-ui:v0.4.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 8080
@@ -8,12 +8,9 @@ resources:
  - pv-media-tv.yaml
  - pv-media-movies.yaml
  - pv-mediafs.yaml
-  - pv-mediastore.yaml
  - pvc-media-tv.yaml
  - pvc-media-movies.yaml
  - pvc-mediafs.yaml
-  - pvc-mediastore.yaml
-  - mediastore-bootstrap-job.yaml
  - media-bucket.yaml
  - backups-bucket.yaml
  - postgres
@@ -1,74 +0,0 @@
---
-# Seeds the directory skeleton on the freshly created mediastore subvolume so
-# the arrs, nzbget and both jellyfins mount subPaths that already exist and are
-# owned by uid/gid 1000 (the uid every arrstack media pod runs as). mkdir -p is
-# idempotent, so re-running it on every sync is harmless and self-heals a tree
-# someone deleted by hand.
-#
-# Sync hook with BeforeHookCreation delete: ArgoCD replaces the completed Job
-# each sync instead of failing on the immutable pod template. No sync-wave is
-# needed -- the PVC applies in the same wave and the pod simply stays Pending
-# until it binds.
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: mediastore-bootstrap
-  namespace: arrstack
-  annotations:
-    argocd.argoproj.io/hook: Sync
-    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
-spec:
-  backoffLimit: 6
-  ttlSecondsAfterFinished: 600
-  template:
-    metadata:
-      labels:
-        app: mediastore-bootstrap
-    spec:
-      serviceAccountName: default
-      automountServiceAccountToken: false
-      restartPolicy: Never
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-        fsGroupChangePolicy: OnRootMismatch
-        seccompProfile:
-          type: RuntimeDefault
-      containers:
-        - name: mkdir
-          image: docker.io/library/alpine:3
-          imagePullPolicy: IfNotPresent
-          command:
-            - sh
-            - -c
-            - |
-              set -eu
-              mkdir -p \
-                /media/fafflix/tvseries \
-                /media/fafflix/movies \
-                /media/cheeztv/tvseries \
-                /media/cheeztv/movies \
-                /media/nzbget/downloads/complete
-              ls -la /media
-          volumeMounts:
-            - name: mediastore
-              mountPath: /media
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          resources:
-            requests:
-              cpu: 10m
-              memory: 32Mi
-            limits:
-              cpu: 200m
-              memory: 128Mi
-      volumes:
-        - name: mediastore
-          persistentVolumeClaim:
-            claimName: mediastore
@@ -1,32 +0,0 @@
---
-# Static PV for the shared MEDIASTORE CephFS subvolume: one 10Ti filesystem
-# holding every library plus the nzbget download tree, so arr imports are
-# same-filesystem hardlink moves across tv AND movies. Same rootPath as the
-# fafflix/cheeztv mediastore PVs; each namespace gets its own PV (unique name +
-# volumeHandle) pinned by claimRef.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: arrstack-mediastore
-spec:
-  capacity:
-    storage: 10Ti
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: ""
-  volumeMode: Filesystem
-  claimRef:
-    namespace: arrstack
-    name: mediastore
-  csi:
-    driver: cephfs.csi.ceph.com
-    volumeHandle: arrstack-mediastore-static
-    nodeStageSecretRef:
-      name: csi-cephfs-secret
-      namespace: csi-cephfs
-    volumeAttributes:
-      staticVolume: "true"
-      clusterID: cephfs_csi_ssd_ec_4_1
-      fsName: cephfs
-      rootPath: /volumes/csi_ssd_ec_4_1/mediastore/a0152dac-a51b-4b95-ac5e-ecdd99bfe3f1
@@ -1,22 +0,0 @@
---
-# Whole media tree (/fafflix, /cheeztv, /nzbget) on one RWX filesystem, shared
-# across the sonarr/radarr/nzbget pods. Statically bound to the
-# arrstack-mediastore PV (the same CephFS subvolume fafflix and cheeztv mount).
-# storageClassName "" + volumeName disables dynamic provisioning and binds the
-# pre-created static PV.
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mediastore
-  namespace: arrstack
-  annotations:
-    k8up.io/backup: "false"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Ti
-  storageClassName: ""
-  volumeName: arrstack-mediastore
-  volumeMode: Filesystem
@@ -28,7 +28,7 @@ metadata:
 spec:
  shards: 1
  replicas: 2
-  image: docker.io/valkey/valkey:9.0.0
+  image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/valkey/valkey:9.0.0
  exporter:
    enabled: false
  scheduling:
@@ -36,7 +36,7 @@ spec:
              mountPath: /combined-certs
      containers:
        - name: api
-          image: git.unkin.net/unkin/artifactapi:v3.11.2
+          image: git.unkin.net/unkin/artifactapi:v3.11.1
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 8000
@@ -1,21 +1,4 @@
 ---
-# Path split between the authenticated UI and the unauthenticated machine API.
-# Longest matching prefix wins, so the two UI rules take precedence over "/".
-#
-# AUTHENTICATED (oauth2 Service -> oauth2-proxy -> ui Service):
-#   /oauth2   oauth2-proxy sign_in / start / callback / sign_out
-#   /ui       the human-facing SPA
-#
-# NOT AUTHENTICATED (artifactapi Service, unchanged):
-#   /api/v1/{remote,local,virtual}/*   package proxy reads (yum/dnf, pip, ...)
-#   /api/v2/remotes|virtuals|locals/*  management API + the UI's own XHR calls
-#   /api/v2/remotes/{name}/files/*     CI publish uploads (PUT) and downloads
-#   /v2/*                              Docker Registry V2 (containerd, buildah)
-#   /terraform/v1/providers/*          Terraform provider registry
-#   /.well-known/terraform.json        Terraform service discovery
-#   /health, /version, /               probes and the redirect to /ui/
-# Those clients cannot complete a browser OIDC flow, so they must never be
-# routed through oauth2-proxy.
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
@@ -39,17 +22,7 @@ spec:
    - backendRefs:
        - group: ""
          kind: Service
-          name: oauth2
-          port: 80
-          weight: 1
-      matches:
-        - path:
-            type: PathPrefix
-            value: /oauth2
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: oauth2
+          name: ui
          port: 80
          weight: 1
      matches:
@@ -12,8 +12,6 @@ resources:
  - gateway.yaml
  - httproute.yaml
  - namespace.yaml
-  - oauth2-proxy-configmap.yaml
-  - oauth2-proxy-deployment.yaml
  - redis-deployment.yaml
  - services.yaml
  - ui-deployment.yaml
@@ -1,46 +0,0 @@
---
-# Non-secret oauth2-proxy configuration (client_id/secret/cookie_secret come
-# from the oauth-credentials Secret).
-#
-# SCOPE: this proxy fronts the artifactapi web UI ONLY. The HTTPRoute sends just
-# /ui and /oauth2 here; every machine surface (/api/v1, /api/v2, /v2 docker
-# registry, /terraform, /.well-known/terraform.json, /health, /version, /) goes
-# straight to the api Service and is NOT authenticated. yum/dnf, containerd
-# registry mirrors, docker/buildah, terraform init and Woodpecker publish steps
-# cannot complete a browser OIDC flow, so they must never reach this container.
-# Its only upstream is the ui Service -- there is deliberately no api upstream.
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: artifactapi-oauth2-env
-  namespace: artifactapi
-data:
-  OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4180"
-  OAUTH2_PROXY_METRICS_ADDRESS: "0.0.0.0:44180"
-  OAUTH2_PROXY_PROVIDER: "oidc"
-  # Publicly-trusted Authentik host: the authorize step is a browser redirect,
-  # so the issuer must present a cert every user's browser already trusts (the
-  # k8s host serves an internal-CA cert). Slug from terraform-authentik.
-  OAUTH2_PROXY_OIDC_ISSUER_URL: "https://identity.unkin.net/application/o/artifactapi/"
-  OAUTH2_PROXY_REDIRECT_URL: "https://artifactapi.k8s.syd1.au.unkin.net/oauth2/callback"
-  OAUTH2_PROXY_UPSTREAMS: "http://ui.artifactapi.svc.cluster.local:80/"
-  OAUTH2_PROXY_SCOPE: "openid email profile ak_groups"
-  # Populate session.Groups from the Authentik hierarchical ak_groups claim.
-  OAUTH2_PROXY_OIDC_GROUPS_CLAIM: "ak_groups"
-  OAUTH2_PROXY_ALLOWED_GROUPS: "akP-artifactapi-admin"
-  OAUTH2_PROXY_PASS_USER_HEADERS: "true"
-  OAUTH2_PROXY_EMAIL_DOMAINS: "*"
-  # Authentik hardcodes email_verified=false in the id_token; authorization is
-  # enforced via ak_groups, so accepting the unverified email is safe.
-  OAUTH2_PROXY_INSECURE_OIDC_ALLOW_UNVERIFIED_EMAIL: "true"
-  OAUTH2_PROXY_COOKIE_SECURE: "true"
-  OAUTH2_PROXY_COOKIE_DOMAINS: "artifactapi.k8s.syd1.au.unkin.net"
-  OAUTH2_PROXY_WHITELIST_DOMAINS: "artifactapi.k8s.syd1.au.unkin.net"
-  OAUTH2_PROXY_REVERSE_PROXY: "true"
-  OAUTH2_PROXY_CODE_CHALLENGE_METHOD: "S256"
-  OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true"
-  # Back-channel discovery/token calls resolve the issuer inside the cluster,
-  # where it is served under the internal unkin.net CA rather than the publicly
-  # trusted cert the browser sees. Trust the bundle the combine-certs init
-  # container assembles, as every other oauth2-proxy in the estate does.
-  OAUTH2_PROXY_PROVIDER_CA_FILES: "/etc/ssl/combined/ca-certificates.crt"
@@ -1,136 +0,0 @@
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: oauth2
-  namespace: artifactapi
-  annotations:
-    configmap.reloader.stakater.com/auto: "true"
-    secret.reloader.stakater.com/reload: "oauth-credentials,vault-ca-cert"
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: oauth2
-  strategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: oauth2
-    spec:
-      serviceAccountName: default
-      automountServiceAccountToken: false
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 65532
-        runAsGroup: 65532
-        fsGroup: 65532
-        seccompProfile:
-          type: RuntimeDefault
-      initContainers:
-        # The Authentik issuer is served behind the internal unkin.net CA;
-        # combine the system roots with it so oauth2-proxy's OIDC HTTP client
-        # trusts the discovery endpoint.
-        - name: combine-certs
-          image: docker.io/library/alpine:3
-          imagePullPolicy: IfNotPresent
-          command:
-            - sh
-            - -c
-            - cat /etc/ssl/certs/ca-certificates.crt /custom-ca/ca.crt > /combined-certs/ca-certificates.crt
-          volumeMounts:
-            - name: vault-ca-cert
-              mountPath: /custom-ca
-              readOnly: true
-            - name: combined-certs
-              mountPath: /combined-certs
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          resources:
-            requests:
-              cpu: 50m
-              memory: 32Mi
-            limits:
-              cpu: 200m
-              memory: 64Mi
-      containers:
-        - name: oauth2-proxy
-          image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.3
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 4180
-              name: http
-              protocol: TCP
-            - containerPort: 44180
-              name: metrics
-              protocol: TCP
-          envFrom:
-            - configMapRef:
-                name: artifactapi-oauth2-env
-                optional: false
-          env:
-            - name: OAUTH2_PROXY_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: client_id
-            - name: OAUTH2_PROXY_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: client_secret
-            - name: OAUTH2_PROXY_COOKIE_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: cookie_secret
-          livenessProbe:
-            httpGet:
-              path: /ping
-              port: http
-            initialDelaySeconds: 10
-            periodSeconds: 30
-            timeoutSeconds: 5
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /ready
-              port: http
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 3
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          volumeMounts:
-            - name: combined-certs
-              mountPath: /etc/ssl/combined
-              readOnly: true
-          resources:
-            requests:
-              cpu: 50m
-              memory: 64Mi
-            limits:
-              cpu: 500m
-              memory: 256Mi
-      volumes:
-        - name: vault-ca-cert
-          secret:
-            secretName: vault-ca-cert
-            items:
-              - key: ca.crt
-                path: ca.crt
-        - name: combined-certs
-          emptyDir: {}
-      restartPolicy: Always
@@ -54,7 +54,7 @@ spec:
            successThreshold: 1
            timeoutSeconds: 5
        - name: metrics-exporter
-          image: docker.io/oliver006/redis_exporter:v1.89.0
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/oliver006/redis_exporter:v1.89.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 9121
@@ -16,26 +16,6 @@ spec:
  sessionAffinity: None
  type: ClusterIP
 ---
-# Authenticated front door for the web UI only: api-route sends /ui and /oauth2
-# here, oauth2-proxy authenticates and forwards to the ui Service. Every other
-# path reaches the api Service above directly and stays unauthenticated.
-apiVersion: v1
-kind: Service
-metadata:
-  name: oauth2
-  namespace: artifactapi
-spec:
-  internalTrafficPolicy: Cluster
-  ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: http
-  selector:
-    app: oauth2
-  sessionAffinity: None
-  type: ClusterIP
---
 apiVersion: v1
 kind: Service
 metadata:
@@ -22,7 +22,7 @@ spec:
      automountServiceAccountToken: true
      containers:
        - name: ui
-          image: git.unkin.net/unkin/artifactapi-ui:v3.11.2
+          image: git.unkin.net/unkin/artifactapi-ui:v3.11.1
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 80
@@ -32,26 +32,3 @@ spec:
  refreshAfter: 5m
  type: kv-v2
  vaultAuthRef: default
---
-# Authentik OIDC client for the artifactapi UI front door (client_id,
-# client_secret, cookie_secret). Seeded out of band at
-# kv/kubernetes/namespace/artifactapi/default/oauth-credentials; the default
-# k8s auth role already grants the artifactapi/default ServiceAccount read on
-# kv/data/kubernetes/namespace/{{sa_namespace}}/{{sa_name}}/*, so no
-# terraform-vault change is needed. Consumed by the oauth2 Deployment.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: oauth-credentials
-  namespace: artifactapi
-spec:
-  destination:
-    create: true
-    name: oauth-credentials
-    overwrite: true
-  hmacSecretData: true
-  mount: kv
-  path: kubernetes/namespace/artifactapi/default/oauth-credentials
-  refreshAfter: 5m
-  type: kv-v2
-  vaultAuthRef: default
@@ -14,17 +14,3 @@ spec:
  podMetricsEndpoints:
    - port: metrics
      path: /metrics
---
-# Scrape the UI oauth2-proxy (:44180), which exposes sign-in/authz counters.
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMPodScrape
-metadata:
-  name: oauth2
-  namespace: artifactapi
-spec:
-  selector:
-    matchLabels:
-      app: oauth2
-  podMetricsEndpoints:
-    - port: metrics
-      path: /metrics
@@ -64,12 +64,8 @@ spec:
      archive_mode: "on"
      archive_timeout: 5min
      dynamic_shared_memory_type: posix
-      effective_cache_size: 1536MB
+      effective_cache_size: 256MB
      full_page_writes: "on"
-      # Replicas report their oldest xmin to the primary, so multi-second reads on
-      # a hot standby stop exhausting max_standby_streaming_delay and being
-      # cancelled. Retained-dead-tuple cost is negligible on a ~155MB database.
-      hot_standby_feedback: "on"
      log_destination: csvlog
      log_directory: /controller/log
      log_filename: postgres
@@ -81,12 +77,7 @@ spec:
      max_parallel_workers: "16"
      max_replication_slots: "16"
      max_worker_processes: "16"
-      # A pg_stat_statements.* parameter is what makes CNPG treat the extension as
-      # managed and run CREATE EXTENSION in every database; preloading alone does
-      # not create it.
-      pg_stat_statements.max: "10000"
-      pg_stat_statements.track: top
-      shared_buffers: 512MB
+      shared_buffers: 128MB
      shared_memory_type: mmap
      ssl_max_protocol_version: TLSv1.3
      ssl_min_protocol_version: TLSv1.3
@@ -95,9 +86,6 @@ spec:
      wal_log_hints: "on"
      wal_receiver_timeout: 5s
      wal_sender_timeout: 5s
-    # CNPG merges this with the libraries it manages itself.
-    shared_preload_libraries:
-      - pg_stat_statements
    syncReplicaElectionConstraint:
      enabled: false
  primaryUpdateMethod: restart
@@ -117,16 +105,13 @@ spec:
    updateInterval: 30
  resources:
    limits:
-      # 500m is a 50ms CFS quota per 100ms period, exhausted by bursts even at
-      # ~0.01 cores average, so every query pays throttle latency.
-      cpu: "2"
+      cpu: 500m
      # 512Mi OOMKilled replicas under load (shared_buffers 128MB +
      # max_connections 200 leave no headroom) — see incident 2026-07-28.
-      # shared_buffers 512MB needs the same headroom multiple, hence 2Gi.
-      memory: 2Gi
-    requests:
-      cpu: 500m
      memory: 1Gi
+    requests:
+      cpu: 50m
+      memory: 512Mi
  smartShutdownTimeout: 180
  startDelay: 3600
  stopDelay: 1800
@@ -37,22 +37,6 @@ spec:
      name: authentik
      sectionName: https
  rules:
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: authentik-server
-          port: 80
-          weight: 1
-      filters:
-        - type: URLRewrite
-          urlRewrite:
-            path:
-              type: ReplaceFullPath
-              replaceFullPath: /application/o/token/
-      matches:
-        - path:
-            type: Exact
-            value: /application/o/token
    - backendRefs:
        - group: ""
          kind: Service
@@ -102,22 +86,6 @@ spec:
      name: authentik-internal
      sectionName: https
  rules:
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: authentik-server
-          port: 80
-          weight: 1
-      filters:
-        - type: URLRewrite
-          urlRewrite:
-            path:
-              type: ReplaceFullPath
-              replaceFullPath: /application/o/token/
-      matches:
-        - path:
-            type: Exact
-            value: /application/o/token
    - backendRefs:
        - group: ""
          kind: Service
@@ -10,16 +10,12 @@ resources:
  - httproute.yaml
  - ldap-gateway.yaml
  - ldap-httproute.yaml
-  - ldap-outpost-deployment.yaml
-  - ldap-outpost-vaultstaticsecret.yaml
-  - ldap-outpost-vmpodscrape.yaml
  - ldap-service.yaml
  - ldap-tlsroute.yaml
  - namespace.yaml
  - redis-deployment.yaml
  - redis-pvc.yaml
  - redis-service.yaml
-  - server-vmpodscrape.yaml
  - vaultauth.yaml
  - vaultstaticsecret.yaml
  - vmpodscrape.yaml
@@ -1,104 +0,0 @@
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: authentik-ldap-outpost
-  namespace: authentik
-  labels:
-    app.kubernetes.io/name: authentik
-    app.kubernetes.io/component: ldap
-spec:
-  # Outposts are stateless; run two replicas for availability.
-  replicas: 2
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: authentik
-      app.kubernetes.io/component: ldap
-  template:
-    metadata:
-      annotations:
-        secret.reloader.stakater.com/reload: "authentik-ldap-outpost-token,vault-ca-cert"
-      labels:
-        app.kubernetes.io/name: authentik
-        app.kubernetes.io/component: ldap
-    spec:
-      # The outpost validates the authentik core cert (identity.k8s.syd1.au.unkin.net,
-      # signed by the internal unkin.net CA). Combine the base image's public roots
-      # with the reflected vault-ca-cert into one bundle that SSL_CERT_FILE points at,
-      # so AUTHENTIK_INSECURE stays false.
-      initContainers:
-        - name: combine-certs
-          image: alpine:3
-          command:
-            - sh
-            - -c
-            - cat /etc/ssl/certs/ca-certificates.crt /custom-ca/ca.crt > /combined-certs/ca-certificates.crt
-          volumeMounts:
-            - name: vault-ca-cert
-              mountPath: /custom-ca
-              readOnly: true
-            - name: combined-certs
-              mountPath: /combined-certs
-          resources:
-            limits:
-              cpu: 100m
-              memory: 64Mi
-            requests:
-              cpu: 25m
-              memory: 32Mi
-      containers:
-        - name: ldap
-          image: ghcr.io/goauthentik/ldap:2026.5.3
-          imagePullPolicy: IfNotPresent
-          env:
-            - name: AUTHENTIK_HOST
-              value: https://identity.k8s.syd1.au.unkin.net
-            - name: AUTHENTIK_INSECURE
-              value: "false"
-            - name: SSL_CERT_FILE
-              value: /etc/ssl/combined/ca-certificates.crt
-            - name: AUTHENTIK_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: authentik-ldap-outpost-token
-                  key: token
-          ports:
-            - containerPort: 3389
-              name: ldap
-              protocol: TCP
-            - containerPort: 6636
-              name: ldaps
-              protocol: TCP
-            - containerPort: 9300
-              name: metrics
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: ldap
-            initialDelaySeconds: 10
-            periodSeconds: 15
-          readinessProbe:
-            tcpSocket:
-              port: ldap
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          resources:
-            limits:
-              cpu: "1"
-              memory: 512Mi
-            requests:
-              cpu: 50m
-              memory: 128Mi
-          volumeMounts:
-            - name: combined-certs
-              mountPath: /etc/ssl/combined
-              readOnly: true
-      volumes:
-        - name: vault-ca-cert
-          secret:
-            secretName: vault-ca-cert
-            items:
-              - key: ca.crt
-                path: ca.crt
-        - name: combined-certs
-          emptyDir: {}
@@ -1,20 +0,0 @@
---
-# Outpost API token, issued by authentik for the LDAP outpost and seeded into
-# Vault by the terraform-authentik apply. The KV value must exist at this path
-# with a `token` key before the outpost can connect.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: authentik-ldap-outpost-token
-  namespace: authentik
-spec:
-  destination:
-    create: true
-    name: authentik-ldap-outpost-token
-    overwrite: true
-  hmacSecretData: true
-  mount: kv
-  path: kubernetes/namespace/authentik/default/outpost-token
-  refreshAfter: 5m
-  type: kv-v2
-  vaultAuthRef: default
@@ -1,16 +0,0 @@
---
-# Scrape the LDAP outpost's Prometheus endpoint (:9300). Picked up by the
-# observability VMAgent (selectAllByDefault).
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMPodScrape
-metadata:
-  name: authentik-ldap-outpost
-  namespace: authentik
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: authentik
-      app.kubernetes.io/component: ldap
-  podMetricsEndpoints:
-    - port: metrics
-      path: /metrics
@@ -7,10 +7,6 @@ metadata:
 spec:
  internalTrafficPolicy: Cluster
  ports:
-    - name: ldap
-      port: 3389
-      protocol: TCP
-      targetPort: 3389
    - name: ldaps
      port: 6636
      protocol: TCP
@@ -53,7 +53,7 @@ spec:
            - mountPath: /data
              name: redis-data
        - name: metrics-exporter
-          image: docker.io/oliver006/redis_exporter:v1.89.0
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/oliver006/redis_exporter:v1.89.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 9121
@@ -1,16 +0,0 @@
---
-# Scrape the authentik server's django_prometheus endpoint (:9300). Picked up
-# by the observability VMAgent (selectAllByDefault).
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMPodScrape
-metadata:
-  name: authentik-server
-  namespace: authentik
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: authentik
-      app.kubernetes.io/component: server
-  podMetricsEndpoints:
-    - port: metrics
-      path: /metrics
@@ -7,5 +7,4 @@ resources:
  - cluster.yaml
  - tsigkey.yaml
  - zones.yaml
-  - records.yaml
  - agent-dns-rolebinding.yaml
@@ -1,36 +0,0 @@
-# Authoritative delegation records for acme.unkin.net. Without these the zone
-# only holds the operator's seed apex (NS ns1.acme.unkin.net glued to the
-# primary pod IP), which is unroutable off-cluster and goes stale on
-# reschedule. DNSRecords must live in the same namespace as their BindZone.
---
-apiVersion: bind.unkin.net/v1alpha1
-kind: DNSRecord
-metadata:
-  name: acme-apex-ns
-  namespace: bind-external
-spec:
-  zoneRef: acme-unkin-net
-  # "@" is the zone apex.
-  name: "@"
-  type: NS
-  ttl: 3600
-  values:
-    # Matches the parent delegation in Google Cloud DNS. Out of zone, so the
-    # child needs no glue of its own.
-    - acme-ns1.unkin.net.
---
-apiVersion: bind.unkin.net/v1alpha1
-kind: DNSRecord
-metadata:
-  name: acme-ns1-a
-  namespace: bind-external
-spec:
-  zoneRef: acme-unkin-net
-  name: ns1
-  type: A
-  ttl: 3600
-  values:
-    # Public address of this cluster's external BIND, same target as
-    # acme-ns1.unkin.net. Resolvers that cached the seeded ns1.acme.unkin.net
-    # NS name must still reach the zone.
-    - 103.216.191.185
@@ -17,14 +17,3 @@ spec:
  updateKeyRef: certmanager
  allowTransfer:
    - key certmanager
-  # Published apex NS. acme-ns1 is what the parent delegates to and glues; ns1 is
-  # in-zone, so its address is declared below or a reseed would glue it to the
-  # primary pod IP.
-  nameservers:
-    - acme-ns1.unkin.net.
-    - ns1.acme.unkin.net.
-  records:
-    - name: ns1
-      type: A
-      ttl: 3600
-      values: ["103.216.191.185"]
@@ -21,7 +21,7 @@ spec:
        runAsNonRoot: true
      containers:
        - name: operator
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/bind-operator:v0.3.0
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/bind-operator:v0.2.6
          args:
            - --metrics-bind-address=:8080
            - --health-probe-bind-address=:8081
@@ -6,7 +6,7 @@ resources:
  - namespace.yaml
  # CRDs are pulled from the bind-operator repo at the matching tag rather than
  # vendored here, so they never drift from the operator.
-  - https://git.unkin.net/unkin/bind-operator/raw/tag/v0.3.0/config/crd/install.yaml
+  - https://git.unkin.net/unkin/bind-operator/raw/tag/v0.2.6/config/crd/install.yaml
  - rbac.yaml
  - agent-dns-rbac.yaml
  - deployment.yaml
@@ -1,26 +0,0 @@
---
-# Let's Encrypt *.ceph.unkin.net wildcard for the haproxy edge (ceph dashboard).
-# DNS-01 needs the delegated _acme-challenge.ceph.unkin.net CNAME in the public
-# unkin.net zone.
-# _acme-challenge.ceph.unkin.net. CNAME _acme-challenge.ceph.acme.unkin.net.
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: wildcard-ceph-unkin-net
-  namespace: cert-manager
-spec:
-  secretName: wildcard-ceph-unkin-net-tls
-  secretTemplate:
-    annotations:
-      reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "haproxy"
-      reflector.v1.k8s.emberstack.com/reflection-auto-enabled: "true"
-      reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "haproxy"
-  privateKey:
-    size: 4096
-  dnsNames:
-    - "*.ceph.unkin.net"
-  issuerRef:
-    name: letsencrypt
-    kind: ClusterIssuer
-    group: cert-manager.io
@@ -1,26 +0,0 @@
---
-# Let's Encrypt *.main.unkin.net wildcard for the haproxy edge (pve, arr stack,
-# jellyfin, stalwart webadmin/autoconfig). DNS-01 needs the delegated
-# _acme-challenge.main.unkin.net CNAME in the public unkin.net zone.
-# _acme-challenge.main.unkin.net. CNAME _acme-challenge.main.acme.unkin.net.
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: wildcard-main-unkin-net
-  namespace: cert-manager
-spec:
-  secretName: wildcard-main-unkin-net-tls
-  secretTemplate:
-    annotations:
-      reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "haproxy"
-      reflector.v1.k8s.emberstack.com/reflection-auto-enabled: "true"
-      reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "haproxy"
-  privateKey:
-    size: 4096
-  dnsNames:
-    - "*.main.unkin.net"
-  issuerRef:
-    name: letsencrypt
-    kind: ClusterIssuer
-    group: cert-manager.io
@@ -14,9 +14,9 @@ spec:
  secretTemplate:
    annotations:
      reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate,mediamark,repospawner,haproxy"
+      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate"
      reflector.v1.k8s.emberstack.com/reflection-auto-enabled: "true"
-      reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate,mediamark,repospawner,haproxy"
+      reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate"
  privateKey:
    size: 4096
  dnsNames:
@@ -12,5 +12,3 @@ resources:
  - clusterissuer_letsencrypt.yaml
  - clusterissuer_letsencrypt-staging.yaml
  - certificate_wildcard-unkin-net.yaml
-  - certificate_wildcard-main-unkin-net.yaml
-  - certificate_wildcard-ceph-unkin-net.yaml
@@ -15,12 +15,9 @@ resources:
  - pvc-transcode.yaml
  - pv-media-tv.yaml
  - pv-media-movies.yaml
-  - pv-mediastore.yaml
  - pvc-media-tv.yaml
  - pvc-media-movies.yaml
-  - pvc-mediastore.yaml
  - statefulset.yaml
-  - plugin-configmap.yaml
  - pdb.yaml
  - service.yaml
  - valkey.yaml
@@ -1,97 +0,0 @@
---
-# Declarative config for the browser-auth plugins bundled in the jellyfin-ha
-# image (jellyfin-plugin-sso, jellyfin-plugin-ldapauth). Rendered into
-# /config/plugins/configurations/ by the inject-plugin-config initContainer,
-# which substitutes the OidSecret / LdapBindPassword placeholders from the
-# VSO-synced oauth-credentials Secret so no secret is committed here. The SSO
-# provider key "authentik" must match the redirect path segment registered on
-# the shared Authentik "jellyfin" OAuth2 client. Roles/AdminRoles are matched
-# against the hierarchical Authentik groups claim (akP-jellyfin-user grants
-# login, akP-jellyfin-admin grants Jellyfin admin; global admins inherit the
-# latter via akR-global-admin).
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cheeztv-plugin-config
-  namespace: cheeztv
-data:
-  SSO-Auth.xml: |
-    <?xml version="1.0" encoding="utf-8"?>
-    <PluginConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <SamlConfigs />
-      <OidConfigs>
-        <item>
-          <key>
-            <string>authentik</string>
-          </key>
-          <value>
-            <PluginConfiguration>
-              <OidEndpoint>https://identity.unkin.net/application/o/jellyfin/</OidEndpoint>
-              <OidClientId>jellyfin</OidClientId>
-              <OidSecret>@@CLIENT_SECRET@@</OidSecret>
-              <Enabled>true</Enabled>
-              <EnableAuthorization>true</EnableAuthorization>
-              <EnableAllFolders>true</EnableAllFolders>
-              <EnabledFolders />
-              <AdminRoles>
-                <string>akP-jellyfin-admin</string>
-              </AdminRoles>
-              <Roles>
-                <string>akP-jellyfin-user</string>
-                <string>akP-jellyfin-admin</string>
-              </Roles>
-              <EnableFolderRoles>false</EnableFolderRoles>
-              <EnableLiveTvRoles>false</EnableLiveTvRoles>
-              <EnableLiveTv>false</EnableLiveTv>
-              <EnableLiveTvManagement>false</EnableLiveTvManagement>
-              <LiveTvRoles />
-              <LiveTvManagementRoles />
-              <FolderRoleMappings />
-              <RoleClaim>ak_groups</RoleClaim>
-              <OidScopes>
-                <string>openid</string>
-                <string>profile</string>
-                <string>email</string>
-                <string>ak_groups</string>
-              </OidScopes>
-              <CanonicalLinks></CanonicalLinks>
-              <DisableHttps>false</DisableHttps>
-              <DoNotValidateEndpoints>false</DoNotValidateEndpoints>
-              <DoNotValidateIssuerName>false</DoNotValidateIssuerName>
-              <SchemeOverride>https</SchemeOverride>
-            </PluginConfiguration>
-          </value>
-        </item>
-      </OidConfigs>
-    </PluginConfiguration>
-  LDAP-Auth.xml: |
-    <?xml version="1.0" encoding="utf-8"?>
-    <PluginConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <LdapServer>authentik-ldap.authentik.svc.cluster.local</LdapServer>
-      <LdapPort>6636</LdapPort>
-      <UseSsl>true</UseSsl>
-      <UseStartTls>false</UseStartTls>
-      <SkipSslVerify>true</SkipSslVerify>
-      <LdapBindUser>cn=jellyfin-ldap,ou=users,DC=ldap,DC=goauthentik,DC=io</LdapBindUser>
-      <LdapBindPassword>@@LDAP_BIND_PASSWORD@@</LdapBindPassword>
-      <LdapBaseDn>ou=users,DC=ldap,DC=goauthentik,DC=io</LdapBaseDn>
-      <LdapSearchFilter>(objectClass=user)</LdapSearchFilter>
-      <LdapAdminBaseDn>ou=users,DC=ldap,DC=goauthentik,DC=io</LdapAdminBaseDn>
-      <LdapAdminFilter>(memberOf=cn=akP-jellyfin-admin,ou=groups,DC=ldap,DC=goauthentik,DC=io)</LdapAdminFilter>
-      <EnableLdapAdminFilterMemberUid>false</EnableLdapAdminFilterMemberUid>
-      <LdapSearchAttributes>uid, cn, mail, displayName</LdapSearchAttributes>
-      <CreateUsersFromLdap>true</CreateUsersFromLdap>
-      <AllowPassChange>false</AllowPassChange>
-      <LdapUidAttribute>cn</LdapUidAttribute>
-      <LdapUsernameAttribute>cn</LdapUsernameAttribute>
-      <LdapPasswordAttribute>userPassword</LdapPasswordAttribute>
-      <EnableAllFolders>true</EnableAllFolders>
-      <EnabledFolders />
-    </PluginConfiguration>
-  branding.xml: |
-    <?xml version="1.0" encoding="utf-8"?>
-    <BrandingOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <LoginDisclaimer>&lt;p style="text-align:center"&gt;&lt;a href="/sso/OID/start/authentik"&gt;Sign in with SSO&lt;/a&gt;&lt;/p&gt;</LoginDisclaimer>
-      <CustomCss></CustomCss>
-      <SplashscreenEnabled>false</SplashscreenEnabled>
-    </BrandingOptions>
@@ -1,31 +0,0 @@
---
-# Static PV for the shared MEDIASTORE CephFS subvolume. Same rootPath as
-# arrstack's mediastore PV so the arrs write and cheeztv reads the identical
-# library tree (cheeztv scans /cheeztv/{tvseries,movies}); each namespace gets
-# its own PV (unique name + volumeHandle) pinned by claimRef.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: cheeztv-mediastore
-spec:
-  capacity:
-    storage: 10Ti
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: ""
-  volumeMode: Filesystem
-  claimRef:
-    namespace: cheeztv
-    name: cheeztv-mediastore
-  csi:
-    driver: cephfs.csi.ceph.com
-    volumeHandle: cheeztv-mediastore-static
-    nodeStageSecretRef:
-      name: csi-cephfs-secret
-      namespace: csi-cephfs
-    volumeAttributes:
-      staticVolume: "true"
-      clusterID: cephfs_csi_ssd_ec_4_1
-      fsName: cephfs
-      rootPath: /volumes/csi_ssd_ec_4_1/mediastore/a0152dac-a51b-4b95-ac5e-ecdd99bfe3f1
@@ -1,24 +0,0 @@
---
-# Shared media tree, read-many across replicas. Statically bound to the
-# cheeztv-mediastore PV (the CephFS subvolume also used by arrstack and
-# fafflix). storageClassName "" + volumeName disables dynamic provisioning and
-# binds the pre-created static PV.
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: cheeztv-mediastore
-  namespace: cheeztv
-  annotations:
-    # Exclude from the cheeztv-config k8up Schedule (skipWithoutAnnotation is
-    # false cluster-wide, so unannotated PVCs are swept in). Only cheeztv-config
-    # is backed up; the media library is not restic-backup material.
-    k8up.io/backup: "false"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Ti
-  storageClassName: ""
-  volumeName: cheeztv-mediastore
-  volumeMode: Filesystem
@@ -13,4 +13,6 @@ spec:
      targetPort: http
  selector:
    app: cheeztv
+  # Pin each client to one replica to reduce transcode-session churn/takeover.
+  sessionAffinity: ClientIP
  type: ClusterIP
@@ -4,8 +4,6 @@ kind: StatefulSet
 metadata:
  name: cheeztv
  namespace: cheeztv
-  annotations:
-    configmap.reloader.stakater.com/auto: "true"
 spec:
  # HA: two replicas coordinate transcode session ownership through Valkey and
  # resume each other's HLS segments off the shared RWX transcode PVC. Stable
@@ -111,60 +109,9 @@ spec:
          volumeMounts:
            - name: config
              mountPath: /config
-        # Render the SSO/LDAP plugin configs into the shared config volume,
-        # substituting the client secret and LDAP bind password from the
-        # VSO-synced oauth-credentials Secret (never committed). Plugin configs
-        # are fully managed here so they are overwritten every start; the login
-        # button branding is written only when absent so admin edits survive.
-        - name: inject-plugin-config
-          image: busybox:1.37.0
-          command:
-            - sh
-            - -c
-            - |
-              mkdir -p /config/plugins/configurations /config/config
-              chown 1000:1000 /config/plugins /config/plugins/configurations /config/config
-              esc() { printf '%s' "$1" | sed -e 's/[&|\\]/\\&/g'; }
-              cs=$(esc "${CLIENT_SECRET}")
-              lp=$(esc "${LDAP_BIND_PASSWORD}")
-              sed "s|@@CLIENT_SECRET@@|${cs}|" /templates/SSO-Auth.xml > /config/plugins/configurations/SSO-Auth.xml
-              sed "s|@@LDAP_BIND_PASSWORD@@|${lp}|" /templates/LDAP-Auth.xml > /config/plugins/configurations/LDAP-Auth.xml
-              chown 1000:1000 /config/plugins/configurations/SSO-Auth.xml /config/plugins/configurations/LDAP-Auth.xml
-              chmod 600 /config/plugins/configurations/SSO-Auth.xml /config/plugins/configurations/LDAP-Auth.xml
-              if [ ! -e /config/config/branding.xml ]; then
-                cp /templates/branding.xml /config/config/branding.xml
-                chown 1000:1000 /config/config/branding.xml
-                chmod 664 /config/config/branding.xml
-              fi
-          env:
-            - name: CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: client_secret
-                  optional: true
-            - name: LDAP_BIND_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: ldap_bind_password
-                  optional: true
-          resources:
-            requests:
-              cpu: 10m
-              memory: 32Mi
-            limits:
-              cpu: 100m
-              memory: 64Mi
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: plugin-config
-              mountPath: /templates
-              readOnly: true
      containers:
        - name: cheeztv
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:v0.4.0
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:v0.1.3
          imagePullPolicy: IfNotPresent
          ports:
            - name: http
@@ -275,9 +222,6 @@ spec:
              subPath: kids
              readOnly: true
      volumes:
-        - name: plugin-config
-          configMap:
-            name: cheeztv-plugin-config
        - name: config
          persistentVolumeClaim:
            claimName: cheeztv-config
@@ -22,27 +22,3 @@ spec:
  refreshAfter: 5m
  type: kv-v2
  vaultAuthRef: default
---
-# Shared Authentik "jellyfin" OAuth2 client secret (key: client_secret) plus the
-# LDAP outpost bind password (key: ldap_bind_password) for the auth plugins.
-# The default k8s role's templated policy is namespace-scoped
-# (kv/data/kubernetes/namespace/{{sa_namespace}}/{{sa_name}}/*), so each instance
-# reads its own namespace path; the SAME shared values must be seeded at both
-# fafflix and cheeztv paths. VSO syncs into the oauth-credentials Secret, whose
-# keys the inject-plugin-config initContainer substitutes into the plugin XML.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: oauth-credentials
-  namespace: cheeztv
-spec:
-  destination:
-    create: true
-    name: oauth-credentials
-    overwrite: true
-  hmacSecretData: true
-  mount: kv
-  path: kubernetes/namespace/cheeztv/default/oauth-credentials
-  refreshAfter: 5m
-  type: kv-v2
-  vaultAuthRef: default
@@ -21,7 +21,7 @@ spec:
        runAsNonRoot: true
      containers:
        - name: operator
-          image: git.unkin.net/unkin/kea-operator:v0.1.5
+          image: git.unkin.net/unkin/kea-operator:v0.1.3
          args:
            - --metrics-bind-address=:8080
            - --health-probe-bind-address=:8081
@@ -23,7 +23,7 @@ spec:
      automountServiceAccountToken: true
      containers:
        - name: encapi
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/encapi:v0.1.2
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/encapi:v0.1.1
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 8000
@@ -15,12 +15,9 @@ resources:
  - pvc-transcode.yaml
  - pv-media-tv.yaml
  - pv-media-movies.yaml
-  - pv-mediastore.yaml
  - pvc-media-tv.yaml
  - pvc-media-movies.yaml
-  - pvc-mediastore.yaml
  - statefulset.yaml
-  - plugin-configmap.yaml
  - pdb.yaml
  - service.yaml
  - valkey.yaml
@@ -1,97 +0,0 @@
---
-# Declarative config for the browser-auth plugins bundled in the jellyfin-ha
-# image (jellyfin-plugin-sso, jellyfin-plugin-ldapauth). Rendered into
-# /config/plugins/configurations/ by the inject-plugin-config initContainer,
-# which substitutes the OidSecret / LdapBindPassword placeholders from the
-# VSO-synced oauth-credentials Secret so no secret is committed here. The SSO
-# provider key "authentik" must match the redirect path segment registered on
-# the shared Authentik "jellyfin" OAuth2 client. Roles/AdminRoles are matched
-# against the hierarchical Authentik groups claim (akP-jellyfin-user grants
-# login, akP-jellyfin-admin grants Jellyfin admin; global admins inherit the
-# latter via akR-global-admin).
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: fafflix-plugin-config
-  namespace: fafflix
-data:
-  SSO-Auth.xml: |
-    <?xml version="1.0" encoding="utf-8"?>
-    <PluginConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <SamlConfigs />
-      <OidConfigs>
-        <item>
-          <key>
-            <string>authentik</string>
-          </key>
-          <value>
-            <PluginConfiguration>
-              <OidEndpoint>https://identity.unkin.net/application/o/jellyfin/</OidEndpoint>
-              <OidClientId>jellyfin</OidClientId>
-              <OidSecret>@@CLIENT_SECRET@@</OidSecret>
-              <Enabled>true</Enabled>
-              <EnableAuthorization>true</EnableAuthorization>
-              <EnableAllFolders>true</EnableAllFolders>
-              <EnabledFolders />
-              <AdminRoles>
-                <string>akP-jellyfin-admin</string>
-              </AdminRoles>
-              <Roles>
-                <string>akP-jellyfin-user</string>
-                <string>akP-jellyfin-admin</string>
-              </Roles>
-              <EnableFolderRoles>false</EnableFolderRoles>
-              <EnableLiveTvRoles>false</EnableLiveTvRoles>
-              <EnableLiveTv>false</EnableLiveTv>
-              <EnableLiveTvManagement>false</EnableLiveTvManagement>
-              <LiveTvRoles />
-              <LiveTvManagementRoles />
-              <FolderRoleMappings />
-              <RoleClaim>ak_groups</RoleClaim>
-              <OidScopes>
-                <string>openid</string>
-                <string>profile</string>
-                <string>email</string>
-                <string>ak_groups</string>
-              </OidScopes>
-              <CanonicalLinks></CanonicalLinks>
-              <DisableHttps>false</DisableHttps>
-              <DoNotValidateEndpoints>false</DoNotValidateEndpoints>
-              <DoNotValidateIssuerName>false</DoNotValidateIssuerName>
-              <SchemeOverride>https</SchemeOverride>
-            </PluginConfiguration>
-          </value>
-        </item>
-      </OidConfigs>
-    </PluginConfiguration>
-  LDAP-Auth.xml: |
-    <?xml version="1.0" encoding="utf-8"?>
-    <PluginConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <LdapServer>authentik-ldap.authentik.svc.cluster.local</LdapServer>
-      <LdapPort>6636</LdapPort>
-      <UseSsl>true</UseSsl>
-      <UseStartTls>false</UseStartTls>
-      <SkipSslVerify>true</SkipSslVerify>
-      <LdapBindUser>cn=jellyfin-ldap,ou=users,DC=ldap,DC=goauthentik,DC=io</LdapBindUser>
-      <LdapBindPassword>@@LDAP_BIND_PASSWORD@@</LdapBindPassword>
-      <LdapBaseDn>ou=users,DC=ldap,DC=goauthentik,DC=io</LdapBaseDn>
-      <LdapSearchFilter>(objectClass=user)</LdapSearchFilter>
-      <LdapAdminBaseDn>ou=users,DC=ldap,DC=goauthentik,DC=io</LdapAdminBaseDn>
-      <LdapAdminFilter>(memberOf=cn=akP-jellyfin-admin,ou=groups,DC=ldap,DC=goauthentik,DC=io)</LdapAdminFilter>
-      <EnableLdapAdminFilterMemberUid>false</EnableLdapAdminFilterMemberUid>
-      <LdapSearchAttributes>uid, cn, mail, displayName</LdapSearchAttributes>
-      <CreateUsersFromLdap>true</CreateUsersFromLdap>
-      <AllowPassChange>false</AllowPassChange>
-      <LdapUidAttribute>cn</LdapUidAttribute>
-      <LdapUsernameAttribute>cn</LdapUsernameAttribute>
-      <LdapPasswordAttribute>userPassword</LdapPasswordAttribute>
-      <EnableAllFolders>true</EnableAllFolders>
-      <EnabledFolders />
-    </PluginConfiguration>
-  branding.xml: |
-    <?xml version="1.0" encoding="utf-8"?>
-    <BrandingOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <LoginDisclaimer>&lt;p style="text-align:center"&gt;&lt;a href="/sso/OID/start/authentik"&gt;Sign in with SSO&lt;/a&gt;&lt;/p&gt;</LoginDisclaimer>
-      <CustomCss></CustomCss>
-      <SplashscreenEnabled>false</SplashscreenEnabled>
-    </BrandingOptions>
@@ -1,31 +0,0 @@
---
-# Static PV for the shared MEDIASTORE CephFS subvolume. Same rootPath as
-# arrstack's mediastore PV so the arrs write and fafflix reads the identical
-# library tree (fafflix scans /fafflix/{tvseries,movies}); each namespace gets
-# its own PV (unique name + volumeHandle) pinned by claimRef.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: fafflix-mediastore
-spec:
-  capacity:
-    storage: 10Ti
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: ""
-  volumeMode: Filesystem
-  claimRef:
-    namespace: fafflix
-    name: fafflix-mediastore
-  csi:
-    driver: cephfs.csi.ceph.com
-    volumeHandle: fafflix-mediastore-static
-    nodeStageSecretRef:
-      name: csi-cephfs-secret
-      namespace: csi-cephfs
-    volumeAttributes:
-      staticVolume: "true"
-      clusterID: cephfs_csi_ssd_ec_4_1
-      fsName: cephfs
-      rootPath: /volumes/csi_ssd_ec_4_1/mediastore/a0152dac-a51b-4b95-ac5e-ecdd99bfe3f1
@@ -1,24 +0,0 @@
---
-# Shared media tree, read-many across replicas. Statically bound to the
-# fafflix-mediastore PV (the CephFS subvolume also used by arrstack and
-# cheeztv). storageClassName "" + volumeName disables dynamic provisioning and
-# binds the pre-created static PV.
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: fafflix-mediastore
-  namespace: fafflix
-  annotations:
-    # Exclude from the fafflix-config k8up Schedule (skipWithoutAnnotation is
-    # false cluster-wide, so unannotated PVCs are swept in). Only fafflix-config
-    # is backed up; the media library is not restic-backup material.
-    k8up.io/backup: "false"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Ti
-  storageClassName: ""
-  volumeName: fafflix-mediastore
-  volumeMode: Filesystem
@@ -13,4 +13,6 @@ spec:
      targetPort: http
  selector:
    app: fafflix
+  # Pin each client to one replica to reduce transcode-session churn/takeover.
+  sessionAffinity: ClientIP
  type: ClusterIP
@@ -4,8 +4,6 @@ kind: StatefulSet
 metadata:
  name: fafflix
  namespace: fafflix
-  annotations:
-    configmap.reloader.stakater.com/auto: "true"
 spec:
  # HA: two replicas coordinate transcode session ownership through Valkey and
  # resume each other's HLS segments off the shared RWX transcode PVC. Stable
@@ -111,60 +109,9 @@ spec:
          volumeMounts:
            - name: config
              mountPath: /config
-        # Render the SSO/LDAP plugin configs into the shared config volume,
-        # substituting the client secret and LDAP bind password from the
-        # VSO-synced oauth-credentials Secret (never committed). Plugin configs
-        # are fully managed here so they are overwritten every start; the login
-        # button branding is written only when absent so admin edits survive.
-        - name: inject-plugin-config
-          image: busybox:1.37.0
-          command:
-            - sh
-            - -c
-            - |
-              mkdir -p /config/plugins/configurations /config/config
-              chown 1000:1000 /config/plugins /config/plugins/configurations /config/config
-              esc() { printf '%s' "$1" | sed -e 's/[&|\\]/\\&/g'; }
-              cs=$(esc "${CLIENT_SECRET}")
-              lp=$(esc "${LDAP_BIND_PASSWORD}")
-              sed "s|@@CLIENT_SECRET@@|${cs}|" /templates/SSO-Auth.xml > /config/plugins/configurations/SSO-Auth.xml
-              sed "s|@@LDAP_BIND_PASSWORD@@|${lp}|" /templates/LDAP-Auth.xml > /config/plugins/configurations/LDAP-Auth.xml
-              chown 1000:1000 /config/plugins/configurations/SSO-Auth.xml /config/plugins/configurations/LDAP-Auth.xml
-              chmod 600 /config/plugins/configurations/SSO-Auth.xml /config/plugins/configurations/LDAP-Auth.xml
-              if [ ! -e /config/config/branding.xml ]; then
-                cp /templates/branding.xml /config/config/branding.xml
-                chown 1000:1000 /config/config/branding.xml
-                chmod 664 /config/config/branding.xml
-              fi
-          env:
-            - name: CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: client_secret
-                  optional: true
-            - name: LDAP_BIND_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: ldap_bind_password
-                  optional: true
-          resources:
-            requests:
-              cpu: 10m
-              memory: 32Mi
-            limits:
-              cpu: 100m
-              memory: 64Mi
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: plugin-config
-              mountPath: /templates
-              readOnly: true
      containers:
        - name: fafflix
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:v0.4.0
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/jellyfin-ha:v0.1.3
          imagePullPolicy: IfNotPresent
          ports:
            - name: http
@@ -289,9 +236,6 @@ spec:
              subPath: kids
              readOnly: true
      volumes:
-        - name: plugin-config
-          configMap:
-            name: fafflix-plugin-config
        - name: config
          persistentVolumeClaim:
            claimName: fafflix-config
@@ -22,27 +22,3 @@ spec:
  refreshAfter: 5m
  type: kv-v2
  vaultAuthRef: default
---
-# Shared Authentik "jellyfin" OAuth2 client secret (key: client_secret) plus the
-# LDAP outpost bind password (key: ldap_bind_password) for the auth plugins.
-# The default k8s role's templated policy is namespace-scoped
-# (kv/data/kubernetes/namespace/{{sa_namespace}}/{{sa_name}}/*), so each instance
-# reads its own namespace path; the SAME shared values must be seeded at both
-# fafflix and cheeztv paths. VSO syncs into the oauth-credentials Secret, whose
-# keys the inject-plugin-config initContainer substitutes into the plugin XML.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: oauth-credentials
-  namespace: fafflix
-spec:
-  destination:
-    create: true
-    name: oauth-credentials
-    overwrite: true
-  hmacSecretData: true
-  mount: kv
-  path: kubernetes/namespace/fafflix/default/oauth-credentials
-  refreshAfter: 5m
-  type: kv-v2
-  vaultAuthRef: default
@@ -83,7 +83,7 @@ spec:
            - mountPath: /data
              name: data
        - name: metrics-exporter
-          image: docker.io/oliver006/redis_exporter:v1.89.0
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/oliver006/redis_exporter:v1.89.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 9121
@@ -26,6 +26,13 @@ spec:
                    secretKeyRef:
                      name: oauth-credentials
                      key: client_secret
+              # identity.unkin.net is served by the internal unkin.net CA, which
+              # the stock Grafana image doesn't trust. Mount the reflected
+              # vault-ca-cert and point generic_oauth's tls_client_ca at it.
+              volumeMounts:
+                - name: vault-ca-cert
+                  mountPath: /etc/grafana/vault-ca
+                  readOnly: true
              resources:
                requests:
                  cpu: 100m
@@ -33,6 +40,13 @@ spec:
                limits:
                  cpu: "1"
                  memory: 1Gi
+          volumes:
+            - name: vault-ca-cert
+              secret:
+                secretName: vault-ca-cert
+                items:
+                  - key: ca.crt
+                    path: ca.crt
  config:
    server:
      root_url: "https://grafana.k8s.syd1.au.unkin.net"
@@ -57,6 +71,9 @@ spec:
      auth_url: "https://identity.unkin.net/application/o/authorize/"
      token_url: "https://identity.unkin.net/application/o/token/"
      api_url: "https://identity.unkin.net/application/o/userinfo/"
+      # Trust the internal unkin.net CA that signs identity.unkin.net's cert
+      # (mounted from the reflected vault-ca-cert Secret).
+      tls_client_ca: "/etc/grafana/vault-ca/ca.crt"
      # Authentik permission groups -> Grafana roles. akP-grafana-admin is granted
      # to akR-global-admin members (and direct members) via terraform-authentik.
      role_attribute_path: "contains(ak_groups[*], 'akP-grafana-admin') && 'Admin' || 'Viewer'"
@@ -20,22 +20,3 @@ spec:
    jsonData:
      timeInterval: "15s"
      httpMethod: "POST"
---
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDatasource
-metadata:
-  name: victorialogs
-  namespace: grafana
-spec:
-  instanceSelector:
-    matchLabels:
-      dashboards: "grafana"
-  plugins:
-    - name: victoriametrics-logs-datasource
-      version: 0.32.0
-  datasource:
-    name: "VictoriaLogs"
-    type: "victoriametrics-logs-datasource"
-    uid: "victorialogs"
-    access: "proxy"
-    url: "http://vlselect-logs.logging.svc.cluster.local:9471"
@@ -1,274 +0,0 @@
---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: haproxy-config
-  namespace: haproxy
-data:
-  certificate.list: |
-    # First entry is the default cert for non-matching SNI.
-    /etc/haproxy/certs/unkin-net/tls.crt
-    /etc/haproxy/certs/main-unkin-net/tls.crt
-    /etc/haproxy/certs/ceph-unkin-net/tls.crt
-
-  fe_https.map: |
-    sonarr.main.unkin.net be_sonarr
-    radarr.main.unkin.net be_radarr
-    lidarr.main.unkin.net be_lidarr
-    readarr.main.unkin.net be_readarr
-    prowlarr.main.unkin.net be_prowlarr
-    nzbget.main.unkin.net be_nzbget
-    jellyfin.main.unkin.net be_jellyfin
-    fafflix.unkin.net be_jellyfin
-    git.unkin.net be_gitea
-    grafana.unkin.net be_grafana
-    dashboard.ceph.unkin.net be_ceph_dashboard
-    auth.unkin.net be_k8s_kanidm
-
-  haproxy.cfg: |
-    global
-      log stdout format raw local0
-      log stdout format raw local1 notice
-      maxconn  4000
-      hard-stop-after  2m
-      ssl-default-bind-ciphers  EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
-      ssl-default-bind-options  ssl-min-ver TLSv1.2 ssl-max-ver TLSv1.3
-      ssl-default-server-ciphers  kEECDH+aRSA+AES:kRSA+AES:+AES256:RC4-SHA:!kEDH:!LOW:!EXP:!MD5:!aNULL:!eNULL
-      ssl-default-server-options  no-sslv3
-      stats  timeout 30s
-      stats  socket /var/lib/haproxy/stats
-      stats  socket /var/lib/haproxy/admin.sock mode 660 level admin
-      tune.ssl.default-dh-param  2048
-
-    defaults
-      log  global
-      maxconn  5000
-      mode  http
-      option  httplog
-      option  dontlognull
-      option  http-server-close
-      option  forwardfor except 127.0.0.0/8
-      option  redispatch
-      retries  3
-      stats  enable
-      timeout  http-request 10s
-      timeout  queue 1m
-      timeout  connect 10s
-      timeout  client 5m
-      timeout  server 5m
-      timeout  http-keep-alive 10s
-      timeout  check 10s
-
-    frontend fe_https
-      bind 0.0.0.0:443 ssl crt-list /usr/local/etc/haproxy/certificate.list ciphers EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH force-tlsv12
-      mode http
-      description Global HTTPS Frontend
-      http-request set-header X-Forwarded-Proto https
-      http-request set-header X-Real-IP %[src]
-      http-response set-header X-Content-Type-Options nosniff
-      http-response set-header X-XSS-Protection 1;mode=block
-      use_backend %[req.hdr(host),lower,map(/usr/local/etc/haproxy/fe_https.map,be_default)]
-
-    frontend fe_metrics
-      bind 0.0.0.0:8405
-      mode http
-      description Metrics Frontend
-      http-request set-header X-Forwarded-Proto https
-      http-request set-header X-Real-IP %[src]
-      http-request use-service prometheus-exporter if { path /metrics }
-
-    backend be_ceph_dashboard
-      description Backend for Ceph Dashboard from Mgr instances
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-check expect status 200
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 9443 }
-      http-reuse always
-      option httpchk GET /
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      stick-table type ip size 200k expire 30m
-      server prodnxsr0009 198.18.23.9:9443 check cookie prodnxsr0009 fall 2 inter 2s rise 3 ssl verify none
-      server prodnxsr0010 198.18.23.10:9443 check cookie prodnxsr0010 fall 2 inter 2s rise 3 ssl verify none
-      server prodnxsr0011 198.18.23.11:9443 check cookie prodnxsr0011 fall 2 inter 2s rise 3 ssl verify none
-      server prodnxsr0012 198.18.23.12:9443 check cookie prodnxsr0012 fall 2 inter 2s rise 3 ssl verify none
-      server prodnxsr0013 198.18.23.13:9443 check cookie prodnxsr0013 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_default
-      description Backend for unmatched HTTP traffic
-      balance roundrobin
-      cookie SRVNAME insert
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      option httpchk GET /
-      option forwardfor
-
-    backend be_gitea
-      description Backend for gitea cluster
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      stick on src
-      stick-table type ip size 200k expire 30m
-      server ausyd1nxvm2080 198.18.26.18:443 check cookie ausyd1nxvm2080 fall 2 inter 2s rise 3 ssl verify none
-      server ausyd1nxvm2081 198.18.27.117:443 check cookie ausyd1nxvm2081 fall 2 inter 2s rise 3 ssl verify none
-      server ausyd1nxvm2082 198.18.28.71:443 check cookie ausyd1nxvm2082 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_grafana
-      description Backend for grafana nodes
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      stick on src
-      stick-table type ip size 200k expire 30m
-      server ausyd1nxvm2015 198.18.27.2:443 check cookie ausyd1nxvm2015 fall 2 inter 2s rise 3 ssl verify none
-      server ausyd1nxvm2016 198.18.28.189:443 check cookie ausyd1nxvm2016 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_jellyfin
-      description Backend for au-syd1 jellyfin
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2051 198.18.25.164:443 check cookie ausyd1nxvm2051 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_k8s_kanidm
-      description Backend for Kanidm (auth.unkin.net via Kubernetes internal Traefik)
-      balance roundrobin
-      http-reuse always
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      redirect scheme https if !{ ssl_fc }
-      option httpchk
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      http-check connect ssl sni auth.unkin.net
-      http-check send meth GET uri /status ver HTTP/1.1 hdr Host auth.unkin.net
-      http-check expect status 200
-      server k8s-traefik-internal 198.18.200.4:443 ssl verify none check inter 2s rise 3 fall 2 sni str(auth.unkin.net)
-
-    backend be_lidarr
-      description Backend for au-syd1 lidarr
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /consul/health
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2048 198.18.28.165:443 check cookie ausyd1nxvm2048 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_nzbget
-      description Backend for au-syd1 nzbget
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /consul/health
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2045 198.18.25.44:443 check cookie ausyd1nxvm2045 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_prowlarr
-      description Backend for au-syd1 prowlarr
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /consul/health
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2050 198.18.25.66:443 check cookie ausyd1nxvm2050 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_radarr
-      description Backend for au-syd1 radarr
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /consul/health
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2047 198.18.27.131:443 check cookie ausyd1nxvm2047 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_readarr
-      description Backend for au-syd1 readarr
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /consul/health
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2049 198.18.29.32:443 check cookie ausyd1nxvm2049 fall 2 inter 2s rise 3 ssl verify none
-
-    backend be_sonarr
-      description Backend for au-syd1 sonarr
-      balance roundrobin
-      cookie SRVNAME insert indirect nocache
-      http-request set-header X-Forwarded-Port %[dst_port]
-      http-request add-header X-Forwarded-Proto https if { dst_port 443 }
-      http-reuse always
-      option httpchk GET /consul/health
-      option forwardfor
-      option http-keep-alive
-      option prefer-last-server
-      redirect scheme https if !{ ssl_fc }
-      server ausyd1nxvm2046 198.18.26.161:443 check cookie ausyd1nxvm2046 fall 2 inter 2s rise 3 ssl verify none
-
-    # The `peers au-syd1-prod` section is dropped: peer names must be static and a
-    # Deployment cannot provide them. Behind the external Traefik's TLS
-    # passthrough `src` is a Traefik pod, so X-Real-IP, forwardfor and the
-    # `stick on src` tables all key on that; the SRVNAME cookie carries real
-    # session persistence. Traefik cannot emit PROXY protocol to a TLSRoute
-    # backend, so there is nothing to bind `accept-proxy` to.
-
-    listen health
-      bind 0.0.0.0:8404
-      mode http
-      monitor-uri /healthz
-
-    listen stats
-      bind 127.0.0.1:9090
-      mode http
-      stats uri /
-      stats auth admin:admin
@@ -1,148 +0,0 @@
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: haproxy
-  namespace: haproxy
-  annotations:
-    reloader.stakater.com/auto: "true"
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      app: haproxy
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-  template:
-    metadata:
-      labels:
-        app: haproxy
-    spec:
-      automountServiceAccountToken: false
-      terminationGracePeriodSeconds: 150
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchLabels:
-                  app: haproxy
-              topologyKey: kubernetes.io/hostname
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 99
-        runAsGroup: 99
-        seccompProfile:
-          type: RuntimeDefault
-      containers:
-        - name: haproxy
-          image: haproxy:3.2.24-alpine
-          imagePullPolicy: IfNotPresent
-          command:
-            - haproxy
-            - -W
-            - -db
-            - -f
-            - /usr/local/etc/haproxy/haproxy.cfg
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop: [ALL]
-              # fe_https binds the privileged port 443 as uid 99, and the
-              # dst_port ACLs need the real port.
-              add: [NET_BIND_SERVICE]
-          ports:
-            - name: https
-              containerPort: 443
-              protocol: TCP
-            - name: health
-              containerPort: 8404
-              protocol: TCP
-            - name: metrics
-              containerPort: 8405
-              protocol: TCP
-            - name: stats
-              containerPort: 9090
-              protocol: TCP
-          lifecycle:
-            preStop:
-              exec:
-                # SIGUSR1 to the master soft-stops the workers; hard-stop-after
-                # caps the drain. Wait so kubelet holds SIGTERM until it is done.
-                command:
-                  - /bin/sh
-                  - -c
-                  - kill -s USR1 1; while kill -0 1 2>/dev/null; do sleep 1; done
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: health
-            initialDelaySeconds: 15
-            periodSeconds: 30
-            timeoutSeconds: 5
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: health
-            initialDelaySeconds: 5
-            periodSeconds: 5
-            timeoutSeconds: 5
-            failureThreshold: 3
-          resources:
-            requests:
-              cpu: 200m
-              memory: 256Mi
-            limits:
-              cpu: 2
-              memory: 1Gi
-          volumeMounts:
-            - name: config
-              mountPath: /usr/local/etc/haproxy
-              readOnly: true
-            - name: cert-unkin-net
-              mountPath: /etc/haproxy/certs/unkin-net
-              readOnly: true
-            - name: cert-main-unkin-net
-              mountPath: /etc/haproxy/certs/main-unkin-net
-              readOnly: true
-            - name: cert-ceph-unkin-net
-              mountPath: /etc/haproxy/certs/ceph-unkin-net
-              readOnly: true
-            - name: run
-              mountPath: /var/lib/haproxy
-      volumes:
-        - name: config
-          configMap:
-            name: haproxy-config
-        # ssl-load-extra-files loads <crtfile>.key by default, so the key is
-        # projected next to the cert as tls.crt.key.
-        - name: cert-unkin-net
-          secret:
-            secretName: wildcard-unkin-net-tls
-            items:
-              - key: tls.crt
-                path: tls.crt
-              - key: tls.key
-                path: tls.crt.key
-        - name: cert-main-unkin-net
-          secret:
-            secretName: wildcard-main-unkin-net-tls
-            items:
-              - key: tls.crt
-                path: tls.crt
-              - key: tls.key
-                path: tls.crt.key
-        - name: cert-ceph-unkin-net
-          secret:
-            secretName: wildcard-ceph-unkin-net-tls
-            items:
-              - key: tls.crt
-                path: tls.crt
-              - key: tls.key
-                path: tls.crt.key
-        - name: run
-          emptyDir: {}
-      restartPolicy: Always
@@ -1,31 +0,0 @@
---
-# External (DMZ) front for the haproxy edge on the traefik-external LB VIP
-# 198.18.199.0. The :443 listener is TLS Passthrough: haproxy owns the three
-# wildcard certs and terminates behind Traefik, so there are no certificateRefs
-# here. Listener hostnames are deliberately unset and the routes carry the
-# explicit hostname list instead; allowedRoutes Same keeps other namespaces off
-# these listeners.
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: haproxy
-  namespace: haproxy
-  labels:
-    traefik.io/instance: external
-spec:
-  gatewayClassName: traefik-external
-  listeners:
-    - name: http
-      port: 80
-      protocol: HTTP
-      allowedRoutes:
-        namespaces:
-          from: Same
-    - name: https-passthrough
-      port: 443
-      protocol: TLS
-      tls:
-        mode: Passthrough
-      allowedRoutes:
-        namespaces:
-          from: Same
@@ -1,37 +0,0 @@
---
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: haproxy-http-redirect
-  namespace: haproxy
-  labels:
-    app: haproxy
-spec:
-  hostnames:
-    - sonarr.main.unkin.net
-    - radarr.main.unkin.net
-    - lidarr.main.unkin.net
-    - readarr.main.unkin.net
-    - prowlarr.main.unkin.net
-    - nzbget.main.unkin.net
-    - jellyfin.main.unkin.net
-    - fafflix.unkin.net
-    - git.unkin.net
-    - grafana.unkin.net
-    - dashboard.ceph.unkin.net
-    - auth.unkin.net
-  parentRefs:
-    - group: gateway.networking.k8s.io
-      kind: Gateway
-      name: haproxy
-      sectionName: http
-  rules:
-    - filters:
-        - type: RequestRedirect
-          requestRedirect:
-            scheme: https
-            statusCode: 301
-      matches:
-        - path:
-            type: PathPrefix
-            value: /
@@ -1,15 +0,0 @@
---
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - namespace.yaml
-  - configmap.yaml
-  - deployment.yaml
-  - service.yaml
-  - gateway.yaml
-  - tlsroute.yaml
-  - httproute.yaml
-  - pdb.yaml
-  - vpa.yaml
-  - vmpodscrape.yaml
@@ -1,5 +0,0 @@
---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: haproxy
@@ -1,11 +0,0 @@
---
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: haproxy
-  namespace: haproxy
-spec:
-  maxUnavailable: 1
-  selector:
-    matchLabels:
-      app: haproxy
@@ -1,19 +0,0 @@
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: haproxy
-  namespace: haproxy
-spec:
-  type: ClusterIP
-  # Reached only by the external Traefik's TLS-passthrough TLSRoute, so the
-  # peer address here is a Traefik pod, not the client. sessionAffinity is
-  # deliberately absent: keyed on ClientIP it would pin whole Traefik pods,
-  # not clients. Backend persistence rests on the per-backend SRVNAME cookie.
-  selector:
-    app: haproxy
-  ports:
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: https
@@ -1,34 +0,0 @@
---
-apiVersion: gateway.networking.k8s.io/v1
-kind: TLSRoute
-metadata:
-  name: haproxy
-  namespace: haproxy
-  labels:
-    app: haproxy
-spec:
-  hostnames:
-    - sonarr.main.unkin.net
-    - radarr.main.unkin.net
-    - lidarr.main.unkin.net
-    - readarr.main.unkin.net
-    - prowlarr.main.unkin.net
-    - nzbget.main.unkin.net
-    - jellyfin.main.unkin.net
-    - fafflix.unkin.net
-    - git.unkin.net
-    - grafana.unkin.net
-    - dashboard.ceph.unkin.net
-    - auth.unkin.net
-  parentRefs:
-    - group: gateway.networking.k8s.io
-      kind: Gateway
-      name: haproxy
-      sectionName: https-passthrough
-  rules:
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: haproxy
-          port: 443
-          weight: 1
@@ -1,13 +0,0 @@
---
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMPodScrape
-metadata:
-  name: haproxy
-  namespace: haproxy
-spec:
-  selector:
-    matchLabels:
-      app: haproxy
-  podMetricsEndpoints:
-    - port: metrics
-      path: /metrics
@@ -1,13 +0,0 @@
---
-apiVersion: autoscaling.k8s.io/v1
-kind: VerticalPodAutoscaler
-metadata:
-  name: haproxy-vpa
-  namespace: haproxy
-spec:
-  targetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: haproxy
-  updatePolicy:
-    updateMode: "Off"
@@ -61,7 +61,7 @@ spec:
              mountPropagation: None
              name: data
        - name: metrics-exporter
-          image: docker.io/oliver006/redis_exporter:v1.89.0
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/oliver006/redis_exporter:v1.89.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 9121
@@ -1,16 +0,0 @@
---
-# Confines the agent-observability service account (in vm-system) to the
-# agent-observability ClusterRole within this namespace.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: agent-observability
-  namespace: logging
-subjects:
-  - kind: ServiceAccount
-    name: agent-observability
-    namespace: vm-system
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: agent-observability
@@ -87,7 +87,7 @@ spec:
            runAsGroup: 101
          containers:
            - name: clickhouse
-              image: docker.io/clickhouse/clickhouse-server:24.8
+              image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/clickhouse/clickhouse-server:24.8
              resources:
                requests:
                  cpu: 500m
@@ -1,13 +1,16 @@
 ---
-# Log ingestion endpoint for puppet-managed VMs (and any non-k8s client):
-# fronts the VLCluster vlinsert service over TLS at a name VMs can resolve.
+# Log ingestion endpoint for puppet-managed VMs (and any non-k8s client).
+# Reuses the internal Traefik gateway + cert-manager + external-dns pattern so
+# VMs reach the Vector aggregator's HTTP source over TLS at a DNS name they can
+# resolve. The puppet-side Vector rollout ships NDJSON to
+# https://logs-ingest.k8s.syd1.au.unkin.net/ (a later task).
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
  name: logs-ingest
  namespace: logging
  labels:
-    app.kubernetes.io/name: victorialogs
+    app.kubernetes.io/name: vector-aggregator
    app.kubernetes.io/component: ingest
    traefik.io/instance: internal
  annotations:
@@ -5,7 +5,7 @@ metadata:
  name: logs-ingest-http-redirect
  namespace: logging
  labels:
-    app.kubernetes.io/name: victorialogs
+    app.kubernetes.io/name: vector-aggregator
    app.kubernetes.io/component: ingest
 spec:
  hostnames:
@@ -32,7 +32,7 @@ metadata:
  name: logs-ingest
  namespace: logging
  labels:
-    app.kubernetes.io/name: victorialogs
+    app.kubernetes.io/name: vector-aggregator
    app.kubernetes.io/component: ingest
 spec:
  hostnames:
@@ -46,8 +46,8 @@ spec:
    - backendRefs:
        - group: ""
          kind: Service
-          name: vlinsert-logs
-          port: 9481
+          name: vector-vm-ingest
+          port: 8080
          weight: 1
      matches:
        - path:
@@ -32,7 +32,7 @@ spec:
        runAsGroup: 101
      containers:
        - name: clickhouse-schema
-          image: docker.io/clickhouse/clickhouse-server:24.8
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/clickhouse/clickhouse-server:24.8
          securityContext:
            allowPrivilegeEscalation: false
            readOnlyRootFilesystem: true
@@ -10,14 +10,12 @@ resources:
  - job_clickhouse-schema.yaml
  - nats-bootstrap-job.yaml
  - cephrgw.yaml
-  - vlcluster.yaml
  - gateway.yaml
  - httproute.yaml
  - serviceaccount_logarchiver.yaml
  - configmap_logarchiver.yaml
  - deployment_logarchiver.yaml
  - logviewer
-  - agent-observability-rolebinding.yaml

 # Vector pipelines are the single source of truth (also validated by
 # `vector test` in CI). Mounted into each tier via `existingConfigMaps`.
@@ -34,7 +34,7 @@ spec:
        # identity.unkin.net serves a Vault-PKI cert; combine the system roots
        # with the internal CA so oauth2-proxy's OIDC HTTP client trusts it.
        - name: combine-certs
-          image: docker.io/library/alpine:3
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/library/alpine:3
          imagePullPolicy: IfNotPresent
          command:
            - sh
@@ -58,7 +58,7 @@ spec:
        runAsGroup: 1000
      containers:
        - name: nats-bootstrap
-          image: docker.io/natsio/nats-box:0.18.0
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/natsio/nats-box:0.18.0
          # nats CLI stats the working directory when loading its response
          # schemas; under readOnlyRootFilesystem + runAsUser 1000 the image's
          # default WORKDIR is not accessible ("stat .: permission denied"), so
@@ -1,47 +0,0 @@
---
-apiVersion: operator.victoriametrics.com/v1
-kind: VLCluster
-metadata:
-  name: logs
-  namespace: logging
-spec:
-  clusterVersion: v1.52.0
-  vlinsert:
-    replicaCount: 2
-    resources:
-      requests:
-        cpu: 500m
-        memory: 1Gi
-      limits:
-        cpu: "2"
-        memory: 4Gi
-  vlselect:
-    replicaCount: 2
-    resources:
-      requests:
-        cpu: 500m
-        memory: 1Gi
-      limits:
-        cpu: "2"
-        memory: 4Gi
-  vlstorage:
-    replicaCount: 3
-    retentionPeriod: 180d
-    # ~3 GiB/day measured; 220GiB/node cap keeps 180d time-based, not disk-bound
-    retentionMaxDiskSpaceUsageBytes: 220GiB
-    storage:
-      volumeClaimTemplate:
-        spec:
-          accessModes:
-            - ReadWriteOnce
-          storageClassName: cephrbd-fast-delete
-          resources:
-            requests:
-              storage: 250Gi
-    resources:
-      requests:
-        cpu: "1"
-        memory: 2Gi
-      limits:
-        cpu: "4"
-        memory: 8Gi
@@ -1,114 +0,0 @@
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mediamark
-  namespace: mediamark
-  annotations:
-    secret.reloader.stakater.com/reload: "arrstack-virtual-key"
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: mediamark
-  strategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: mediamark
-    spec:
-      serviceAccountName: default
-      automountServiceAccountToken: false
-      securityContext:
-        runAsNonRoot: true
-        # 1000:1000 matches the media tree ownership on the shared mediastore
-        # subvolume; mediamark hardlinks/renames files the *arr apps own, so it
-        # deliberately does NOT run as the usual 65532.
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-        seccompProfile:
-          type: RuntimeDefault
-      containers:
-        - name: mediamark
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/mediamark:v0.1.0
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 8080
-              name: http
-              protocol: TCP
-          env:
-            - name: MEDIAMARK_MEDIA_ROOT
-              value: /media
-            - name: MEDIAMARK_KEYS_DIR
-              value: /etc/mediamark/keys
-            # Virtual keys are only honoured by arrproxy, which validates the
-            # machine token and injects the real per-app key upstream; the
-            # sonarr/radarr Services would reject them.
-            - name: MEDIAMARK_SONARR_URL
-              value: http://arrproxy-api.arrstack.svc.cluster.local:8080/3aa168/sonarr
-            - name: MEDIAMARK_RADARR_URL
-              value: http://arrproxy-api.arrstack.svc.cluster.local:8080/3aa168/radarr
-            # oauth2-proxy --pass-user-headers forwards the Authentik groups as a
-            # comma-joined X-Forwarded-Groups; X-Auth-Request-Groups is
-            # auth_request-response-only and never reaches a proxied upstream.
-            - name: MEDIAMARK_GROUPS_HEADER
-              value: X-Forwarded-Groups
-            - name: MEDIAMARK_ALLOWED_GROUPS
-              value: akP-mediamark-user
-          volumeMounts:
-            - name: mediastore
-              mountPath: /media
-            - name: arr-keys
-              mountPath: /etc/mediamark/keys
-              readOnly: true
-          livenessProbe:
-            httpGet:
-              path: /livez
-              port: http
-            initialDelaySeconds: 10
-            periodSeconds: 30
-            timeoutSeconds: 5
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /readyz
-              port: http
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 3
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          resources:
-            requests:
-              cpu: 50m
-              memory: 64Mi
-            limits:
-              cpu: 500m
-              memory: 256Mi
-      volumes:
-        - name: mediastore
-          persistentVolumeClaim:
-            claimName: mediamark-mediastore
-        # One ephemeral virtual key covers both apps, so the same token lands on
-        # both per-app files under MEDIAMARK_KEYS_DIR; mediamark re-reads the
-        # file per request, so lease renewal rotates in place.
-        - name: arr-keys
-          projected:
-            sources:
-              - secret:
-                  name: arrstack-virtual-key
-                  items:
-                    - key: token
-                      path: sonarr
-                    - key: token
-                      path: radarr
-      restartPolicy: Always
@@ -1,39 +0,0 @@
---
-# External (DMZ) front for mediamark on mediamark.unkin.net via the external
-# Traefik (LB VIP 198.18.199.0). TLS terminates with the real Let's Encrypt
-# *.unkin.net wildcard (Certificate wildcard-unkin-net in cert-manager,
-# reflected into this namespace as wildcard-unkin-net-tls by the emberstack
-# reflector), so there is no cert-manager annotation here. The apex
-# mediamark.unkin.net A record lives in the bind-operator unkin.net zone, NOT
-# external-dns, so no external-dns annotation either. oauth2-proxy fronts both
-# hostnames.
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  labels:
-    traefik.io/instance: external
-  name: mediamark-external
-  namespace: mediamark
-spec:
-  gatewayClassName: traefik-external
-  listeners:
-    - name: http
-      port: 80
-      protocol: HTTP
-      hostname: mediamark.unkin.net
-      allowedRoutes:
-        namespaces:
-          from: Same
-    - name: https
-      port: 443
-      protocol: HTTPS
-      hostname: mediamark.unkin.net
-      allowedRoutes:
-        namespaces:
-          from: Same
-      tls:
-        mode: Terminate
-        certificateRefs:
-          - group: ""
-            kind: Secret
-            name: wildcard-unkin-net-tls
@@ -1,38 +0,0 @@
---
-# Internal front for mediamark (cf. watchstate).
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  labels:
-    traefik.io/instance: internal
-  annotations:
-    cert-manager.io/cluster-issuer: vault-issuer
-    cert-manager.io/common-name: mediamark.k8s.syd1.au.unkin.net
-    cert-manager.io/private-key-size: "4096"
-    external-dns.alpha.kubernetes.io/hostname: mediamark.k8s.syd1.au.unkin.net
-    external-dns.alpha.kubernetes.io/target: 198.18.200.4
-  name: mediamark
-  namespace: mediamark
-spec:
-  gatewayClassName: traefik-internal
-  listeners:
-    - allowedRoutes:
-        namespaces:
-          from: Same
-      hostname: mediamark.k8s.syd1.au.unkin.net
-      name: http
-      port: 80
-      protocol: HTTP
-    - allowedRoutes:
-        namespaces:
-          from: Same
-      hostname: mediamark.k8s.syd1.au.unkin.net
-      name: https
-      port: 443
-      protocol: HTTPS
-      tls:
-        certificateRefs:
-          - group: ""
-            kind: Secret
-            name: mediamark-tls
-        mode: Terminate
@@ -1,49 +0,0 @@
---
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: mediamark-external-http-redirect
-  namespace: mediamark
-spec:
-  hostnames:
-    - mediamark.unkin.net
-  parentRefs:
-    - group: gateway.networking.k8s.io
-      kind: Gateway
-      name: mediamark-external
-      sectionName: http
-  rules:
-    - filters:
-        - type: RequestRedirect
-          requestRedirect:
-            scheme: https
-            statusCode: 301
-      matches:
-        - path:
-            type: PathPrefix
-            value: /
---
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: mediamark-external
-  namespace: mediamark
-spec:
-  hostnames:
-    - mediamark.unkin.net
-  parentRefs:
-    - group: gateway.networking.k8s.io
-      kind: Gateway
-      name: mediamark-external
-      sectionName: https
-  rules:
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: mediamark-oauth2
-          port: 4180
-          weight: 1
-      matches:
-        - path:
-            type: PathPrefix
-            value: /
@@ -1,49 +0,0 @@
---
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: mediamark-http-redirect
-  namespace: mediamark
-spec:
-  hostnames:
-    - mediamark.k8s.syd1.au.unkin.net
-  parentRefs:
-    - group: gateway.networking.k8s.io
-      kind: Gateway
-      name: mediamark
-      sectionName: http
-  rules:
-    - filters:
-        - type: RequestRedirect
-          requestRedirect:
-            scheme: https
-            statusCode: 301
-      matches:
-        - path:
-            type: PathPrefix
-            value: /
---
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: mediamark
-  namespace: mediamark
-spec:
-  hostnames:
-    - mediamark.k8s.syd1.au.unkin.net
-  parentRefs:
-    - group: gateway.networking.k8s.io
-      kind: Gateway
-      name: mediamark
-      sectionName: https
-  rules:
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: mediamark-oauth2
-          port: 4180
-          weight: 1
-      matches:
-        - path:
-            type: PathPrefix
-            value: /
@@ -1,19 +0,0 @@
---
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - namespace.yaml
-  - vaultauth.yaml
-  - vaultstaticsecret.yaml
-  - vaultdynamicsecret.yaml
-  - pv-mediastore.yaml
-  - pvc-mediastore.yaml
-  - deployment.yaml
-  - oauth2-proxy-configmap.yaml
-  - oauth2-proxy-deployment.yaml
-  - service.yaml
-  - gateway.yaml
-  - httproute.yaml
-  - gateway-external.yaml
-  - httproute-external.yaml
@@ -1,7 +0,0 @@
---
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app.kubernetes.io/name: mediamark
-  name: mediamark
@@ -1,45 +0,0 @@
---
-# Non-secret oauth2-proxy configuration (client_id/secret/cookie_secret come
-# from the oauth-credentials Secret). Single auth front for mediamark on both
-# host names; access is gated here on the akP-mediamark-user Authentik group and
-# re-checked by the app from X-Forwarded-Groups.
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mediamark-oauth2-env
-  namespace: mediamark
-data:
-  OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4180"
-  OAUTH2_PROXY_PROVIDER: "oidc"
-  OAUTH2_PROXY_OIDC_ISSUER_URL: "https://identity.unkin.net/application/o/mediamark/"
-  # Relative (host-less) redirect URL: with reverse-proxy mode on, oauth2-proxy
-  # derives scheme+host per request from X-Forwarded-Proto/Host, so the same
-  # deployment serves BOTH the external mediamark.unkin.net and internal
-  # mediamark.k8s.syd1.au.unkin.net callbacks. Both absolute callback URIs are
-  # registered on the Authentik provider (terraform-authentik, separate PR).
-  OAUTH2_PROXY_REDIRECT_URL: "/oauth2/callback"
-  OAUTH2_PROXY_UPSTREAMS: "http://mediamark.mediamark.svc.cluster.local:8080/"
-  OAUTH2_PROXY_SCOPE: "openid email profile ak_groups"
-  # Populate session.Groups from the Authentik ak_groups claim; pass-user-headers
-  # then emits it as a single comma-joined X-Forwarded-Groups header.
-  OAUTH2_PROXY_OIDC_GROUPS_CLAIM: "ak_groups"
-  OAUTH2_PROXY_ALLOWED_GROUPS: "akP-mediamark-user"
-  # Forward identity + groups to mediamark as X-Forwarded-{User,Email,Groups}.
-  # NOTE: set-xauthrequest is intentionally NOT set -- it only populates
-  # auth_request *response* headers, which never reach a proxied upstream.
-  OAUTH2_PROXY_PASS_USER_HEADERS: "true"
-  OAUTH2_PROXY_EMAIL_DOMAINS: "*"
-  # Authentik hardcodes email_verified=false in the id_token; authorization is
-  # enforced via ak_groups, so accepting the unverified email is safe.
-  OAUTH2_PROXY_INSECURE_OIDC_ALLOW_UNVERIFIED_EMAIL: "true"
-  OAUTH2_PROXY_COOKIE_SECURE: "true"
-  # One cookie domain per host (a single parent-domain cookie can't span
-  # unkin.net and k8s.syd1.au.unkin.net cleanly); oauth2-proxy picks the domain
-  # matching the request host. Whitelist both so post-auth `rd` redirects to
-  # either front door are honoured.
-  OAUTH2_PROXY_COOKIE_DOMAINS: "mediamark.unkin.net,mediamark.k8s.syd1.au.unkin.net"
-  OAUTH2_PROXY_WHITELIST_DOMAINS: "mediamark.unkin.net,mediamark.k8s.syd1.au.unkin.net"
-  OAUTH2_PROXY_REVERSE_PROXY: "true"
-  OAUTH2_PROXY_PROVIDER_CA_FILES: "/etc/ssl/combined/ca-certificates.crt"
-  OAUTH2_PROXY_CODE_CHALLENGE_METHOD: "S256"
-  OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true"
@@ -1,133 +0,0 @@
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mediamark-oauth2
-  namespace: mediamark
-  annotations:
-    configmap.reloader.stakater.com/auto: "true"
-    secret.reloader.stakater.com/reload: "oauth-credentials,vault-ca-cert"
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: mediamark-oauth2
-  strategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: mediamark-oauth2
-    spec:
-      serviceAccountName: default
-      automountServiceAccountToken: false
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 65532
-        runAsGroup: 65532
-        fsGroup: 65532
-        seccompProfile:
-          type: RuntimeDefault
-      initContainers:
-        # The Authentik issuer is served behind the internal unkin.net CA;
-        # combine the system roots with it so oauth2-proxy's OIDC HTTP client
-        # trusts the discovery endpoint.
-        - name: combine-certs
-          image: docker.io/library/alpine:3
-          imagePullPolicy: IfNotPresent
-          command:
-            - sh
-            - -c
-            - cat /etc/ssl/certs/ca-certificates.crt /custom-ca/ca.crt > /combined-certs/ca-certificates.crt
-          volumeMounts:
-            - name: vault-ca-cert
-              mountPath: /custom-ca
-              readOnly: true
-            - name: combined-certs
-              mountPath: /combined-certs
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          resources:
-            requests:
-              cpu: 50m
-              memory: 32Mi
-            limits:
-              cpu: 200m
-              memory: 64Mi
-      containers:
-        - name: oauth2-proxy
-          image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.3
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 4180
-              name: http
-              protocol: TCP
-          envFrom:
-            - configMapRef:
-                name: mediamark-oauth2-env
-                optional: false
-          env:
-            - name: OAUTH2_PROXY_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: client_id
-            - name: OAUTH2_PROXY_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: client_secret
-            - name: OAUTH2_PROXY_COOKIE_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: oauth-credentials
-                  key: cookie_secret
-          volumeMounts:
-            - name: combined-certs
-              mountPath: /etc/ssl/combined
-              readOnly: true
-          livenessProbe:
-            httpGet:
-              path: /ping
-              port: http
-            initialDelaySeconds: 10
-            periodSeconds: 30
-            timeoutSeconds: 5
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /ready
-              port: http
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 3
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          resources:
-            requests:
-              cpu: 50m
-              memory: 64Mi
-            limits:
-              cpu: 500m
-              memory: 256Mi
-      volumes:
-        - name: vault-ca-cert
-          secret:
-            secretName: vault-ca-cert
-            items:
-              - key: ca.crt
-                path: ca.crt
-        - name: combined-certs
-          emptyDir: {}
-      restartPolicy: Always
@@ -1,32 +0,0 @@
---
-# Static PV for the shared MEDIASTORE CephFS subvolume, same rootPath as the
-# arrstack/fafflix/cheeztv mediastore PVs. Each namespace gets its own PV
-# (unique name + volumeHandle) pinned by claimRef; mediamark reads and rewrites
-# the same library tree the *arr apps import into, so it must be the same
-# filesystem (hardlink-safe).
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: mediamark-mediastore
-spec:
-  capacity:
-    storage: 10Ti
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: ""
-  volumeMode: Filesystem
-  claimRef:
-    namespace: mediamark
-    name: mediamark-mediastore
-  csi:
-    driver: cephfs.csi.ceph.com
-    volumeHandle: mediamark-mediastore-static
-    nodeStageSecretRef:
-      name: csi-cephfs-secret
-      namespace: csi-cephfs
-    volumeAttributes:
-      staticVolume: "true"
-      clusterID: cephfs_csi_ssd_ec_4_1
-      fsName: cephfs
-      rootPath: /volumes/csi_ssd_ec_4_1/mediastore/a0152dac-a51b-4b95-ac5e-ecdd99bfe3f1
@@ -1,20 +0,0 @@
---
-# Statically bound to the mediamark-mediastore PV; storageClassName "" +
-# volumeName disables dynamic provisioning. Not backed up here -- the media tree
-# is backed up once from arrstack.
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mediamark-mediastore
-  namespace: mediamark
-  annotations:
-    k8up.io/backup: "false"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Ti
-  storageClassName: ""
-  volumeName: mediamark-mediastore
-  volumeMode: Filesystem
@@ -1,36 +0,0 @@
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: mediamark
-  namespace: mediamark
-spec:
-  internalTrafficPolicy: Cluster
-  ports:
-    - name: http
-      port: 8080
-      protocol: TCP
-      targetPort: http
-  selector:
-    app: mediamark
-  sessionAffinity: None
-  type: ClusterIP
---
-# Front-door entry Service: both HTTPRoutes target this; all traffic enters via
-# oauth2-proxy.
-apiVersion: v1
-kind: Service
-metadata:
-  name: mediamark-oauth2
-  namespace: mediamark
-spec:
-  internalTrafficPolicy: Cluster
-  ports:
-    - name: http
-      port: 4180
-      protocol: TCP
-      targetPort: http
-  selector:
-    app: mediamark-oauth2
-  sessionAffinity: None
-  type: ClusterIP
@@ -1,38 +0,0 @@
---
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: default
-  namespace: mediamark
-spec:
-  allowedNamespaces:
-    - mediamark
-  kubernetes:
-    audiences:
-      - vault
-    role: default
-    serviceAccount: default
-    tokenExpirationSeconds: 600
-  method: kubernetes
-  mount: k8s/au/syd1
-  vaultConnectionRef: vso-system/default
---
-# Separate auth for the arrstack secrets engine: the `mediamark` k8s role is the
-# only one whose policy grants arrstack/creds/mediamark.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: arrstack-creds
-  namespace: mediamark
-spec:
-  allowedNamespaces:
-    - mediamark
-  kubernetes:
-    audiences:
-      - vault
-    role: mediamark
-    serviceAccount: default
-    tokenExpirationSeconds: 600
-  method: kubernetes
-  mount: k8s/au/syd1
-  vaultConnectionRef: vso-system/default
@@ -1,21 +0,0 @@
---
-# Ephemeral arrstack virtual key. The engine mints one machine token covering
-# both radarr and sonarr; it is only honoured by arrproxy, which validates it and
-# swaps in the real per-app key upstream. Role ttl is 60s, so VSO renews the
-# lease continuously (renewalPercent default 67) and rewrites the secret; the
-# reloader annotation restarts pods when the token actually changes.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultDynamicSecret
-metadata:
-  name: arrstack-virtual-key
-  namespace: mediamark
-spec:
-  allowStaticCreds: false
-  destination:
-    create: true
-    name: arrstack-virtual-key
-    overwrite: true
-  mount: arrstack
-  path: creds/mediamark
-  revoke: true
-  vaultAuthRef: arrstack-creds
@@ -1,22 +0,0 @@
---
-# Authentik OIDC client for the mediamark front door (client_id, client_secret,
-# cookie_secret) at kv/kubernetes/namespace/mediamark/default/oauth-credentials.
-# The default k8s role's templated policy already grants read on
-# kv/data/kubernetes/namespace/{{sa_namespace}}/{{sa_name}}/*, so no
-# terraform-vault change is needed.
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: oauth-credentials
-  namespace: mediamark
-spec:
-  destination:
-    create: true
-    name: oauth-credentials
-    overwrite: true
-  hmacSecretData: true
-  mount: kv
-  path: kubernetes/namespace/mediamark/default/oauth-credentials
-  refreshAfter: 5m
-  type: kv-v2
-  vaultAuthRef: default
@@ -83,7 +83,7 @@ spec:
            - mountPath: /data
              name: data
        - name: metrics-exporter
-          image: docker.io/oliver006/redis_exporter:v1.89.0
+          image: artifactapi.k8s.syd1.au.unkin.net/dockerhub/oliver006/redis_exporter:v1.89.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 9121
@@ -1,16 +0,0 @@
---
-# Confines the agent-observability service account (in vm-system) to the
-# agent-observability ClusterRole within this namespace.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: agent-observability
-  namespace: observability
-subjects:
-  - kind: ServiceAccount
-    name: agent-observability
-    namespace: vm-system
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: agent-observability
@@ -13,4 +13,3 @@ resources:
  - httproute.yaml
  - vmpodscrape-cnpg.yaml
  - vmpodscrape-traefik.yaml
-  - agent-observability-rolebinding.yaml
@@ -6,11 +6,14 @@ metadata:
  namespace: pdbmux
 data:
  PDBMUX_LISTEN: ":8080"
-  # Two PuppetDB backends merged during the VM -> k8s migration, in precedence
-  # order (first wins ties / pass-through):
-  #   new = the in-cluster k8s PuppetDB (plain HTTP on 8080; in-cluster address
-  #         is preferred over the external gateway to avoid a hairpin)
+  # Two PuppetDB backends merged during the VM -> k8s migration:
  #   old = legacy Consul-registered puppetdbapi (reachable from pods via the
  #         Consul DNS the puppet workloads already use)
-  PDBMUX_BACKENDS: "new=http://puppetdb.puppet.svc.cluster.local:8080,old=http://puppetdbapi.service.consul:8080"
+  #   new = the in-cluster k8s PuppetDB (plain HTTP on 8080; in-cluster address
+  #         is preferred over the external gateway to avoid a hairpin).
+  PDBMUX_BACKENDS: "old=http://puppetdbapi.service.consul:8080,new=http://puppetdb.puppet.svc.cluster.local:8080"
+  # "new" (the k8s PuppetDB) is the primary for non-merged pass-through and the
+  # preferred backend for ties / static-merge fallback.
+  PDBMUX_PRIMARY: "new"
+  PDBMUX_PREFER: "new"
  PDBMUX_MERGE: "freshness"
@@ -25,14 +25,15 @@ spec:
        - name: pdbmux
          # Image is published by the pdbmux repo's .woodpecker/docker.yaml on
          # a v* tag. It only exists after that tag is cut (see PR merge gates).
-          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/pdbmux:v0.4.0
+          image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/pdbmux:v0.1.0
          imagePullPolicy: IfNotPresent
          ports:
            - containerPort: 8080
              name: http
              protocol: TCP
          envFrom:
-            # PDBMUX_LISTEN / PDBMUX_BACKENDS / PDBMUX_MERGE
+            # PDBMUX_LISTEN / PDBMUX_BACKENDS / PDBMUX_PRIMARY / PDBMUX_PREFER /
+            # PDBMUX_MERGE
            - configMapRef:
                name: pdbmux-env
                optional: false
@@ -11,10 +11,9 @@ metadata:
  namespace: puppet
 data:
  OPENVOXSERVER_PORT: "8140"
-  OPENVOXSERVER_ENVIRONMENT_TIMEOUT: "0"
  DNS_ALT_NAMES: "puppetserver-compiler,puppet,puppet.k8s.syd1.au.unkin.net"
  OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
  CA_ENABLED: "false"
  CA_HOSTNAME: "puppetca"
  CA_PORT: "8140"
-  OPENVOXSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+  PUPPETSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
--- a/Show More
+++ b/Show More