fix(edu-master): bound session refreshes and expire stale cookies

.gitea/tests/deploy-validation.sh

@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-# Local regressions only: kubectl is mocked and Docker is used for config parsing.
-set -euo pipefail
-repo="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
-scratch="$(mktemp -d)"
-trap 'rm -rf "$scratch"' EXIT
-
-mkdir -p "$scratch/repo/app" "$scratch/repo/postgres" "$scratch/repo/netbird" "$scratch/repo/renovate"
-git -C "$scratch/repo" init -q
-for file in app/compose.yaml postgres/shared-compose.yaml netbird/client.compose.yaml renovate/renovate-compose.yaml; do
-  touch "$scratch/repo/$file"
-done
-git -C "$scratch/repo" add .
-# shellcheck source=../workflows/compose-lint.sh
-source "$repo/.gitea/workflows/compose-lint.sh"
-actual="$(cd "$scratch/repo" && compose_files)"
-expected=$'app/compose.yaml\nnetbird/client.compose.yaml\npostgres/shared-compose.yaml\nrenovate/renovate-compose.yaml'
-[ "$actual" = "$expected" ] || { echo 'Compose discovery missed a file' >&2; exit 1; }
-
-cat >"$scratch/compose.yaml" <<'YAML'
-services:
-  example:
-    image: busybox:1.37.0
-    environment:
-      REQUIRED: ${HOMELAB_TEST_REQUIRED:?required for this regression}
-YAML
-unset HOMELAB_TEST_REQUIRED
-if validate_compose_file "$scratch/compose.yaml" >"$scratch/config.log" 2>&1; then
-  echo 'Full Compose validation accepted a missing variable' >&2
-  exit 1
-fi
-grep -q 'required for this regression' "$scratch/config.log"
-HOMELAB_TEST_REQUIRED=present validate_compose_file "$scratch/compose.yaml"
-
-cat >"$scratch/resources.json" <<'JSON'
-{"kind":"List","items":[
-  {"kind":"Deployment","metadata":{"namespace":"app"},"spec":{"template":{"spec":{
-    "containers":[{"envFrom":[{"secretRef":{"name":"credentials"}},{"secretRef":{"name":"optional","optional":true}}],"env":[{"valueFrom":{"secretKeyRef":{"name":"credentials","key":"password"}}}]}],
-    "initContainers":[{"envFrom":[{"secretRef":{"name":"init"}}]}],
-    "imagePullSecrets":[{"name":"registry"}],
-    "volumes":[{"secret":{"secretName":"mounted"}},{"projected":{"sources":[{"secret":{"name":"projected"}},{"secret":{"name":"optional-projected","optional":true}}]}}]
-  }}}},
-  {"kind":"CronJob","metadata":{},"spec":{"jobTemplate":{"spec":{"template":{"spec":{"containers":[{"envFrom":[{"secretRef":{"name":"cron"}}]}]}}}}}},
-  {"kind":"IngressRoute","metadata":{"namespace":"app"},"spec":{"tls":{"secretName":"controller-issued-tls"}}}
-]}
-JSON
-actual="$(jq -r -f "$repo/.gitea/workflows/secret-references.jq" "$scratch/resources.json" | sort)"
-expected=$'app credentials\napp init\napp mounted\napp projected\napp registry\ndefault cron'
-[ "$actual" = "$expected" ] || { echo "Unexpected Secret references: $actual" >&2; exit 1; }
-
-REPO="$repo"
-# shellcheck source=../workflows/deploy-lib.sh
-source "$repo/.gitea/workflows/deploy-lib.sh"
-K8S_MANIFESTS=("$scratch/resources.json")
-KUSTOMIZE_APPS=()
-# No live cluster access. Reject credentials in app even if they exist elsewhere.
-kubectl() {
-  case "$1" in
-    create) cat "$scratch/resources.json" ;;
-    get)
-      if [ "$3" = credentials ] && [ "$5" = app ]; then
-        return 1
-      fi
-      return 0
-      ;;
-    *) echo "Unexpected kubectl invocation: $*" >&2; return 1 ;;
-  esac
-}
-if check_referenced_secrets >"$scratch/secrets.log"; then
-  echo 'Namespace-scoped Secret check accepted a missing Secret' >&2
-  exit 1
-fi
-grep -q 'MISSING OR UNREADABLE: app/credentials' "$scratch/secrets.log"
-# API/rendering errors must not produce an empty reference list and pass.
-kubectl() { return 1; }
-if check_referenced_secrets >"$scratch/secrets.log"; then
-  echo 'Secret check accepted a failed manifest render' >&2
-  exit 1
-fi
-printf '%s\n' 'Deploy validation regressions passed.'

.gitea/workflows/ci.yaml

@@ -3,7 +3,7 @@ name: ci
 on:
   push:
     branches:
-      - main
+      - "**"
   pull_request:
   workflow_dispatch:
 
@@ -88,7 +88,7 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          tools_dir="$(bash .gitea/workflows/install-ci-tools.sh shellcheck jq)"
+          tools_dir="$(bash .gitea/workflows/install-ci-tools.sh shellcheck)"
           export PATH="$tools_dir:$PATH"
           mapfile -t scripts < <(
             git ls-files '*.sh' ':(glob)**/*.bash'
@@ -98,7 +98,6 @@ jobs:
             exit 0
           fi
           shellcheck --external-sources --source-path=SCRIPTDIR --severity=style "${scripts[@]}"
-          bash .gitea/tests/deploy-validation.sh
 
   lint-prettier:
     runs-on: [self-hosted, linux, arch, homelab]

.gitea/workflows/compose-lint.sh

@@ -21,7 +21,8 @@
 # All committed Compose files, including the ones deploy never starts.
 compose_files() {
   git ls-files \
-    '*compose.yaml' '*compose.yml'
+    '*/compose.yaml' '*/compose.yml' 'compose.yaml' 'compose.yml' \
+    '*/docker-compose.yaml' '*/docker-compose.yml'
 }
 
 # Prints the flags that turn `docker compose config` into the general check.

.gitea/workflows/deploy-lib.sh

@@ -31,16 +31,6 @@ warn() {
   echo "WARNING: $*" >&2
 }
 
-# Prune needs the complete desired set in one invocation. Per-file pruning
-# treats resources from the other files as absent and can delete them.
-check_prune_mode() {
-  if [ "$APPLY_PRUNE" = "true" ]; then
-    echo "ERROR: APPLY_PRUNE=true is unsupported by the per-file deploy loop." >&2
-    echo "Disable it; remove obsolete resources explicitly after review." >&2
-    return 1
-  fi
-}
-
 collect_k8s() {
   git -C "$REPO" ls-files -- "$1" \
     | grep -E '\.ya?ml$' \
@@ -696,53 +686,27 @@ stage_preflight() {
   git -C "$REPO" reset --hard "$target"
 }
 
-# Required pod Secrets, scoped to the resource namespace. TLS route Secrets are
-# created by cert-manager and are not prerequisites for applying a Certificate.
-check_referenced_secrets() {
-  local m k objects refs extracted ns name
-  local missing=()
-  refs=""
-  for m in ${K8S_MANIFESTS[@]+"${K8S_MANIFESTS[@]}"}; do
-    objects="$(kubectl create --dry-run=client --validate=false -f "$m" -o json)" || return 1
-    extracted="$(printf '%s' "$objects" | jq -r -f "$REPO/.gitea/workflows/secret-references.jq")" || return 1
-    refs+="$extracted"$'\n'
-  done
-  for k in ${KUSTOMIZE_APPS[@]+"${KUSTOMIZE_APPS[@]}"}; do
-    objects="$(kubectl kustomize "$k" | kubectl create --dry-run=client --validate=false -f - -o json)" || return 1
-    extracted="$(printf '%s' "$objects" | jq -r -f "$REPO/.gitea/workflows/secret-references.jq")" || return 1
-    refs+="$extracted"$'\n'
-  done
-  while read -r ns name; do
-    [ -n "${name:-}" ] || continue
-    if kubectl get secret "$name" -n "$ns" -o name >/dev/null 2>&1; then
-      echo "  ok: $ns/$name"
-    else
-      echo "  MISSING OR UNREADABLE: $ns/$name"
-      missing+=("$ns/$name")
-    fi
-  done < <(printf '%s' "$refs" | sort -u)
-  if [ "${#missing[@]}" -gt 0 ]; then
-    echo "ERROR: required pod Secrets are missing or unreadable:"
-    printf '  - %s\n' "${missing[@]}"
-    echo "Create them in the listed namespaces from the service's secret example."
-    return 1
-  fi
-}
-
 stage_validate() {
-  check_prune_mode || return 1
   cd "$REPO"
   select_manifests
   local m k cf
-  # The deploy host has the local .env and secret files. Resolve them here so
+  # Compose .env files and secret files are gitignored by design, so the
-  # missing configuration fails before either apply job changes workloads.
+  # workstation never has real values for the inactive stacks. This stage only
-  # CI keeps the structure-only check for inactive stacks.
+  # runs the full check on active stacks; the general structure check for every
+  # committed Compose file (active or not) lives in the ci workflow, which has no
+  # .env at all.
+  #
+  # Active stacks are still validated with interpolation and env-file resolution
+  # off, so required-variable guards (:?) and missing local files do not fail the
+  # deploy. Normalization and consistency checks stay enabled.
   # shellcheck source=compose-lint.sh
   source "$REPO/.gitea/workflows/compose-lint.sh"
+  local compose_validate_flags=()
+  mapfile -t compose_validate_flags < <(compose_safe_flags)
   log "Validate compose stacks"
   for cf in ${COMPOSE_STACKS[@]+"${COMPOSE_STACKS[@]}"}; do
     echo "  config: $cf"
-    validate_compose_file "$cf"
+    validate_compose_file "$cf" ${compose_validate_flags[@]+"${compose_validate_flags[@]}"}
   done
   log "Validate k8s manifests (kubectl dry-run=client)"
   for m in ${K8S_MANIFESTS[@]+"${K8S_MANIFESTS[@]}"}; do
@@ -760,20 +724,48 @@ stage_validate() {
   done
   log "Checking referenced Secrets exist"
   echo "  (deploy never applies *secret*.yaml; create missing ones manually)"
-  check_referenced_secrets
+  local ref_secrets=() missing_secrets=() all_secrets s
+  if [ "${#K8S_MANIFESTS[@]}" -gt 0 ]; then
+    while IFS= read -r s; do
+      [ -n "$s" ] && ref_secrets+=("$s")
+    done < <(
+      {
+        grep -h -A1 -E 'secretRef:|secretKeyRef:' "${K8S_MANIFESTS[@]}" 2>/dev/null || true
+        grep -h -E 'secretName:' "${K8S_MANIFESTS[@]}" 2>/dev/null || true
+      } | grep -E 'name:' | sed -E 's/.*name:[[:space:]]*//' | tr -d '"'"'"' "'"'" | sed -E 's/[[:space:]]*#.*//' | awk 'NF' | sort -u || true
+    )
+  fi
+  all_secrets="$(kubectl get secrets -A --no-headers -o custom-columns=:metadata.name 2>/dev/null || true)"
+  for s in ${ref_secrets[@]+"${ref_secrets[@]}"}; do
+    if printf '%s\n' "$all_secrets" | grep -qx "$s"; then
+      echo "  ok: $s"
+    else
+      echo "  MISSING: $s"
+      missing_secrets+=("$s")
+    fi
+  done
+  if [ "${#missing_secrets[@]}" -gt 0 ]; then
+    echo "ERROR: ${#missing_secrets[@]} referenced Secret(s) not found in the cluster:"
+    printf '  - %s\n' "${missing_secrets[@]}"
+    echo "Create them manually from the laptop, e.g.:"
+    echo "  kubectl apply -f SERVICE/k8s/secrets.yaml  # see SERVICE/k8s/secrets.yaml.example"
+    exit 1
+  fi
 }
 
 stage_apply_k8s() {
-  check_prune_mode || return 1
   cd "$REPO"
   select_manifests >/dev/null
-  local ns_files=() other_files=() m k
+  local ns_files=() other_files=() m k prune_opts=()
   for m in ${K8S_MANIFESTS[@]+"${K8S_MANIFESTS[@]}"}; do
     case "$m" in
       */namespace.y?ml) ns_files+=("$m") ;;
       *) other_files+=("$m") ;;
     esac
   done
+  if [ "$APPLY_PRUNE" = "true" ]; then
+    prune_opts=(--prune -l app.kubernetes.io/managed-by=homelab-deploy)
+  fi
 
   # Record what is about to change, and publish it for the verify job, before
   # the first apply. Both are fatal on failure: see snapshot_dir.
@@ -798,7 +790,7 @@ stage_apply_k8s() {
   if [ "${#other_files[@]}" -gt 0 ]; then
     log "Applying resources (${#other_files[@]} files, our images pinned to digests)"
     for m in "${other_files[@]}"; do
-      if ! render_pinned <"$m" | kubectl apply -f -; then
+      if ! render_pinned <"$m" | kubectl apply "${prune_opts[@]}" -f -; then
         echo "ERROR: apply failed for ${m#"$REPO"/}" >&2
         exit 1
       fi

.gitea/workflows/deploy.yaml

@@ -5,7 +5,6 @@ on:
   # workflow_dispatch so a red lint/validate run can never reach the cluster.
   workflow_run:
     workflows: [ci]
-    branches: [main]
     types: [completed]
   workflow_dispatch:
 

.gitea/workflows/install-ci-tools.sh

@@ -120,15 +120,6 @@ install_shellcheck() {
   rm -rf "$tmp"
 }
 
-install_jq() {
-  if at_version jq "${JQ_VERSION}"; then
-    return 0
-  fi
-  fetch "https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux-${goarch}" \
-    "$BIN_DIR/jq"
-  chmod 0755 "$BIN_DIR/jq"
-}
-
 install_uv() {
   if at_version uv "${UV_VERSION}"; then
     return 0
@@ -245,7 +236,6 @@ for tool in "${wanted[@]}"; do
   case "$tool" in
     kubeconform) install_kubeconform ;;
     shellcheck) install_shellcheck ;;
-    jq) install_jq ;;
     actionlint) install_actionlint ;;
     prettier) install_prettier ;;
     ruff) install_ruff ;;

.gitea/workflows/renovate-ci.yaml

@@ -2,23 +2,9 @@ name: renovate-ci
 
 on:
   pull_request:
-    paths:
-      - "renovate/**"
-      - ".gitea/workflows/renovate-ci.yaml"
-      - ".gitea/workflows/sync-renovate-configmap.sh"
-      - ".gitea/workflows/compose-lint.sh"
-      - ".gitea/workflows/install-ci-tools.sh"
-      - ".gitea/workflows/tool-versions.env"
   push:
     branches:
       - main
-    paths:
-      - "renovate/**"
-      - ".gitea/workflows/renovate-ci.yaml"
-      - ".gitea/workflows/sync-renovate-configmap.sh"
-      - ".gitea/workflows/compose-lint.sh"
-      - ".gitea/workflows/install-ci-tools.sh"
-      - ".gitea/workflows/tool-versions.env"
   workflow_dispatch:
 
 permissions:

.gitea/workflows/secret-references.jq

@@ -1,13 +0,0 @@
-# kubectl emits a List for files containing multiple resources.
-(if .kind == "List" then .items[] else . end)
-| (.metadata.namespace // "default") as $ns
-| [
-    (.. | objects
-      | (.secretRef? // empty), (.secretKeyRef? // empty), (.secret? // empty)
-      | select(.optional != true)
-      | .name // .secretName // empty),
-    (.. | objects | .imagePullSecrets[]?.name)
-  ]
-| unique[]
-| select(. != null and . != "")
-| "\($ns) \(.)"

.gitea/workflows/tool-versions.env

@@ -31,6 +31,3 @@ UV_VERSION="0.12.17"
 # so the tree that gets tested is the tree that gets built. Renovate keeps this
 # in step with the Dockerfile's node: tag via the "node runtime" group.
 NODE_VERSION="22.23.3"
-
-# Secret-reference regression tests parse rendered Kubernetes objects.
-JQ_VERSION="1.8.1"

adguardhome/compose.yaml

@@ -31,7 +31,7 @@ services:
       - "traefik.http.routers.adguard-dev.entrypoints=websecure"
       - "traefik.http.routers.adguard-dev.tls=true"
       # DoH Router
-      - "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`)"
+      - "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz` || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`))"
       - "traefik.http.routers.dns-over-https.entrypoints=websecure"
       - "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt"
 

adguardhome/k8s/adguard.yaml

@@ -51,8 +51,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: adguard-deployment
   namespace: adguard
 spec:
@@ -66,6 +64,8 @@ spec:
     metadata:
       labels:
         app: adguard
+      annotations:
+        reloader.stakater.com/auto: "true"
     spec:
       containers:
         - name: adguard

authentik/k8s/authentik.yaml

@@ -27,8 +27,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: authentik-server-deployment
   namespace: authentik
 spec:
@@ -65,8 +63,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: authentik-worker-deployment
   namespace: authentik
 spec:

cfddns/k8s/deployment.yaml

@@ -1,8 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: cfddns
   labels:
     app: cfddns

checkmk/k8s/checkmk.yaml

@@ -17,8 +17,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: checkmk-deployment
   namespace: checkmk
 spec:

cloudflared/k8s/deployment.yaml

@@ -1,8 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: cloudflared
   labels:
     app: cloudflared

converters/k8s/convertx.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: convertx-deployment
   namespace: converters
 spec:

edu_master/.env.example

@@ -1,10 +1,11 @@
-EDU_LOGIN=your_edu_login_here
+KEEPER_LOGIN=your_edu_login_here
-EDU_PASSWORD=your_edu_password_here
+KEEPER_PASSWORD=your_edu_password_here
-EDU_URL_LOGIN=https://edu.edu.vn.ua/user/login
+EDU_URL_BASE=https://edu.edu.vn.ua
-EDU_URL_VERIFY=https://edu.edu.vn.ua/course/userlist
+EDU_URL_LOGIN=/user/login
-PHPSESSID_INTERVAL=10
+EDU_URL_COURSES=/course/userlist
+KEEPER_INTERVAL=10
 USER_AGENT="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"
-WEBINAR_URL=https://edu.edu.vn.ua/webinar/useractive
+EDU_URL_WEBINAR=/webinar/useractive
 WEBINAR_CHECK_INTERVAL=60
 REDIS_HOST=redis
 REDIS_PORT=6379

edu_master/k8s/session-keeper.yaml

@@ -1,8 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: session-keeper
   namespace: edu-master
   labels:

edu_master/k8s/webinar-checker.yaml

@@ -1,8 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: webinar-checker
   namespace: edu-master
   labels:

edu_master/phpsessid-bot/bot.py

@@ -48,17 +48,43 @@ def touch_success_file():
         logger.error(f'Failed to touch success file: {e}')
 
 
+def refresh_session(session, redis_client):
+    """Publish a verified cookie with a lifetime tied to the refresh interval."""
+    login_response = session.post(
+        URL_LOGIN, data={'login': LOGIN, 'password': PASSWORD}, allow_redirects=True, timeout=(10, 30)
+    )
+    login_response.raise_for_status()
+    verify_response = session.get(URL_VERIFY, allow_redirects=False, timeout=(10, 30))
+    if verify_response.status_code != 200:
+        logger.warning('Session verification failed (HTTP %s)', verify_response.status_code)
+        return False
+    phpsessid = session.cookies.get('PHPSESSID')
+    if not phpsessid:
+        logger.warning('Verified response did not provide a PHPSESSID cookie')
+        return False
+    redis_client.set('EDU_PHPSESSID', phpsessid, ex=INTERVAL * 120)
+    touch_success_file()
+    logger.info('Verified session saved to Redis')
+    return True
+
+
 def main():
+    if not LOGIN or not PASSWORD:
+        raise ValueError('KEEPER_LOGIN and KEEPER_PASSWORD must be set')
+    if INTERVAL <= 0:
+        raise ValueError('KEEPER_INTERVAL must be a positive number of minutes')
     logger.info('Starting Session Keeper Bot')
 
     # Connect to Redis
     try:
-        redis_client = redis.Redis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
+        redis_client = redis.Redis(
+            host=REDIS_HOST, port=REDIS_PORT, decode_responses=True, socket_connect_timeout=5, socket_timeout=5
+        )
         redis_client.ping()
         logger.info(f'Connected to Redis at {REDIS_HOST}:{REDIS_PORT}')
     except Exception as e:
         logger.error(f'Failed to connect to Redis: {e}')
-        return
+        raise
 
     session = requests.Session()
 
@@ -83,44 +109,7 @@ def main():
 
     while True:
         try:
-            logger.info('Attempting login...')
+            refresh_session(session, redis_client)
-
-            # Login payload
-            payload = {'login': LOGIN, 'password': PASSWORD}
-
-            # Perform Login
-            # Note: The user request shows a POST to /user/login with form data
-            # We need to make sure we handle the PHPSESSID correctly.
-            # If we already have a PHPSESSID, requests will send it.
-
-            login_response = session.post(URL_LOGIN, data=payload, allow_redirects=True)
-
-            logger.info(f'Login Response Status: {login_response.status_code}')
-            logger.info(f'Cookies after login: {session.cookies.get_dict()}')
-
-            # Verify Session
-            logger.info('Verifying session...')
-            verify_response = session.get(URL_VERIFY, allow_redirects=False)
-
-            logger.info(f'Verify Response Status: {verify_response.status_code}')
-
-            if verify_response.status_code == 200:
-                logger.info('Session verification SUCCESS (200 OK).')
-                touch_success_file()
-
-                # Save PHPSESSID to Redis
-                phpsessid = session.cookies.get('PHPSESSID')
-                if phpsessid:
-                    try:
-                        redis_client.set('EDU_PHPSESSID', phpsessid)
-                        logger.info(f'Saved PHPSESSID to Redis: {phpsessid}')
-                    except Exception as e:
-                        logger.error(f'Failed to save PHPSESSID to Redis: {e}')
-            elif verify_response.status_code == 302:
-                logger.warning('Session verification FAILED (302 Redirect). Session might be invalid.')
-            else:
-                logger.warning(f'Session verification returned unexpected status: {verify_response.status_code}')
-
         except Exception as e:
             logger.error(f'An error occurred: {e}')
 

gitea/k8s/gitea.yaml

@@ -17,8 +17,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: gitea-deployment
   namespace: gitea
 spec:

glance/k8s/glance.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: glance-deployment
   namespace: glance
 spec:

homarr/k8s/homarr.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: homarr-deployment
   namespace: homarr
 spec:

immich/k8s/immich.yaml

@@ -14,8 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: immich-deployment
   namespace: immich
   labels:

immich/k8s/machine-learning.yaml

@@ -14,8 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: immich-machine-learning-deployment
   namespace: immich
   labels:

immich/k8s/valkey.yaml

@@ -17,8 +17,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: immich-valkey
   namespace: immich
   labels:

kener/k8s/kener.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: kener-deployment
   namespace: kener
 spec:

metube/k8s/metube.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: metube-deployment
   namespace: metube
 spec:

n8n/k8s/n8n.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: n8n-deployment
   namespace: n8n
 spec:

netbird/entrypoint.sh

@@ -1,109 +0,0 @@
-#!/bin/sh
-set -eu
-
-umask 077
-
-TEMPLATE_PATH=/opt/netbird/config.template.yaml
-RENDERED_PATH=/run/netbird/config.yaml
-RELAY_SECRET_PATH=/run/secrets/relay_auth_secret
-ENCRYPTION_KEY_PATH=/run/secrets/datastore_encryption_key
-
-is_valid_proxy_subnet() {
-  candidate="$1"
-  case "$candidate" in
-    0.0.0.0/0)
-      return 1
-      ;;
-    */*)
-      address="${candidate%%/*}"
-      prefix="${candidate#*/}"
-      ;;
-    *)
-      return 1
-      ;;
-  esac
-
-  case "$prefix" in
-    0|[1-9]|[1-2][0-9]|3[0-2]) ;;
-    *)
-      return 1
-      ;;
-  esac
-
-  old_ifs="$IFS"
-  IFS=.
-  # shellcheck disable=SC2086
-  set -- $address
-  IFS="$old_ifs"
-  [ "$#" -eq 4 ] || return 1
-
-  for octet do
-    case "$octet" in
-      0|[1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]) ;;
-      *)
-        return 1
-        ;;
-    esac
-  done
-}
-
-read_secret() {
-  secret_path="$1"
-
-  if [ ! -r "$secret_path" ]; then
-    echo "Required secret is not readable: $secret_path" >&2
-    exit 1
-  fi
-
-  secret_value="$(cat "$secret_path")"
-  if [ -z "$secret_value" ]; then
-    echo "Required secret is empty: $secret_path" >&2
-    exit 1
-  fi
-
-  printf '%s' "$secret_value"
-}
-
-if [ -z "${NETBIRD_DOMAIN:-}" ]; then
-  echo "NETBIRD_DOMAIN must be set" >&2
-  exit 1
-fi
-
-case "$NETBIRD_DOMAIN" in
-  *[!A-Za-z0-9.-]*)
-    echo "NETBIRD_DOMAIN contains unsupported characters" >&2
-    exit 1
-    ;;
-esac
-
-if [ -z "${NETBIRD_PROXY_SUBNET:-}" ] || [ "$NETBIRD_PROXY_SUBNET" = "auto" ]; then
-  echo "NETBIRD_PROXY_SUBNET must be an explicit IPv4 CIDR; run netbird/setup.sh first" >&2
-  exit 1
-fi
-if ! is_valid_proxy_subnet "$NETBIRD_PROXY_SUBNET"; then
-  echo "NETBIRD_PROXY_SUBNET must be a non-default IPv4 CIDR, for example 172.20.0.0/16" >&2
-  exit 1
-fi
-
-if [ "$#" -ne 2 ] || [ "$1" != "--config" ] || [ "$2" != "$RENDERED_PATH" ]; then
-  echo "Expected: --config $RENDERED_PATH" >&2
-  exit 1
-fi
-
-relay_secret="$(read_secret "$RELAY_SECRET_PATH")"
-encryption_key="$(read_secret "$ENCRYPTION_KEY_PATH")"
-
-mkdir -p "$(dirname "$RENDERED_PATH")"
-sed \
-  -e "s|__NETBIRD_DOMAIN__|${NETBIRD_DOMAIN}|g" \
-  -e "s|__NETBIRD_AUTH_SECRET__|${relay_secret}|g" \
-  -e "s|__NETBIRD_ENCRYPTION_KEY__|${encryption_key}|g" \
-  -e "s|__NETBIRD_PROXY_SUBNET__|${NETBIRD_PROXY_SUBNET}|g" \
-  "$TEMPLATE_PATH" >"$RENDERED_PATH"
-
-if grep -q '__NETBIRD_' "$RENDERED_PATH"; then
-  echo "Rendered NetBird configuration still contains unresolved placeholders" >&2
-  exit 1
-fi
-
-exec /go/bin/netbird-server "$@"

netbird/k8s/netbird.yaml

@@ -32,8 +32,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: netbird-server-deployment
   namespace: netbird
 spec:
@@ -128,8 +126,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: netbird-dashboard-deployment
   namespace: netbird
 spec:

netbird/setup.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# Prepare local Compose configuration without replacing existing credentials.
-set -euo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-umask 077
-if [ ! -f .env ]; then
-  cp .env.example .env
-fi
-
-if grep -q '^NETBIRD_PROXY_SUBNET=auto$' .env; then
-  subnet="$(docker network inspect proxy --format '{{range .IPAM.Config}}{{println .Subnet}}{{end}}' | awk '/^[0-9]+\./ { print; exit }')"
-  if [ -z "$subnet" ]; then
-    echo "No IPv4 subnet found on the Docker proxy network. Set NETBIRD_PROXY_SUBNET in .env." >&2
-    exit 1
-  fi
-  # The detected value must be safe to substitute into the env file.
-  if [[ ! "$subnet" =~ ^[0-9.]+/[0-9]+$ ]]; then
-    echo "Unexpected Docker network subnet: $subnet" >&2
-    exit 1
-  fi
-  sed -i "s|^NETBIRD_PROXY_SUBNET=auto$|NETBIRD_PROXY_SUBNET=$subnet|" .env
-fi
-
-mkdir -p secrets
-chmod 700 secrets
-for name in relay-auth-secret datastore-encryption-key; do
-  path="secrets/$name"
-  if [ -e "$path" ]; then
-    if [ ! -s "$path" ]; then
-      echo "Existing secret is empty: $path. Restore it before continuing." >&2
-      exit 1
-    fi
-  else
-    openssl rand -base64 32 >"$path"
-  fi
-  chmod 600 "$path"
-done
-printf '%s\n' 'Local files are ready. Review .env, then run docker compose config --quiet.'

netbox/k8s/netbox.yaml

@@ -14,8 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: netbox-deployment
   namespace: netbox
   labels:
@@ -120,8 +118,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: netbox-worker-deployment
   namespace: netbox
   labels:

netbox/k8s/valkey.yaml

@@ -17,8 +17,6 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: netbox-valkey
   namespace: netbox
   labels:

netronome/k8s/netronome.yaml

@@ -14,8 +14,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: netronome-deployment
   namespace: netronome
   labels:

reloader/k8s/reloader-values.yaml

@@ -1,17 +1,11 @@
 # Pinned chart: stakater/reloader 2.2.17 (app v1.4.22).
 # Deployed by the deploy workflow, namespace reloader.
 # Restarts pods when a ConfigMap or Secret they consume changes. Opt-in per workload
-# via the reloader.stakater.com/auto: "true" workload annotation; watchGlobally because
+# via the reloader.stakater.com/auto: "true" pod annotation; watchGlobally because
 # the workloads that need it are spread across a few dozen namespaces.
 
 reloader:
   watchGlobally: true
-  # Only opted-in workloads are restarted. Keep scheduled jobs on their schedule.
-  autoReloadAll: false
-  ignoreJobs: true
-  ignoreCronJobs: true
-  # Change pod-template annotations rather than injecting STAKATER_* env vars.
-  reloadStrategy: annotations
 
   deployment:
     replicas: 1

searxng/compose.yaml

@@ -12,11 +12,11 @@ services:
       - "traefik.enable=true"
       - "traefik.http.services.searxng.loadbalancer.server.port=8080"
       # Prod Router
-      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz`) || Host(`search.forust.xyz`)"
+      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz` || `search.forust.xyz`)"
       - "traefik.http.routers.searxng.entrypoints=websecure"
       - "traefik.http.routers.searxng.tls.certresolver=letsencrypt"
       # Local Router
-      - "traefik.http.routers.searxng-local.rule=Host(`s.workstation.internal`) || Host(`searxng.workstation.internal`)"
+      - "traefik.http.routers.searxng-local.rule=Host(`s.workstation.internal` || `searxng.workstation.internal`)"
       - "traefik.http.routers.searxng-local.entrypoints=websecure"
       - "traefik.http.routers.searxng-local.tls=true"
       # Dev Router

searxng/k8s/searxng.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: searxng-deployment
   namespace: searxng
 spec:

termix/k8s/termix.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: termix-deployment
   namespace: termix
 spec:

tests/test_netbird_runtime.py

@@ -1,87 +0,0 @@
-"""Exercise local setup and config rendering without a Docker daemon."""
-
-import os
-import shutil
-import subprocess
-import tempfile
-import unittest
-from pathlib import Path
-
-ROOT = Path(__file__).resolve().parents[1]
-
-
-class NetbirdRuntimeTests(unittest.TestCase):
-    def setUp(self):
-        self.temp = tempfile.TemporaryDirectory()
-        self.addCleanup(self.temp.cleanup)
-        self.root = Path(self.temp.name)
-        self.stack = self.root / 'netbird'
-        self.stack.mkdir()
-        for name in ('setup.sh', '.env.example', 'config.template.yaml'):
-            shutil.copy(ROOT / 'netbird' / name, self.stack / name)
-        binary = self.root / 'bin'
-        binary.mkdir()
-        docker = binary / 'docker'
-        docker.write_text('#!/bin/sh\nprintf "%s\\n" 172.20.0.0/16\n')
-        docker.chmod(0o755)
-        self.env = dict(os.environ, PATH=f'{binary}:{os.environ["PATH"]}')
-
-    def setup(self):
-        return subprocess.run(  # noqa: S603 - executes the repository script copied into this test's temp dir
-            ['/bin/bash', str(self.stack / 'setup.sh')], env=self.env, capture_output=True, check=False
-        )
-
-    def test_setup_preserves_existing_secrets_and_env(self):
-        self.assertEqual(self.setup().returncode, 0)
-        paths = [self.stack / '.env', *sorted((self.stack / 'secrets').iterdir())]
-        before = [p.read_bytes() for p in paths]
-        self.assertIn(b'NETBIRD_PROXY_SUBNET=172.20.0.0/16', before[0])
-        self.assertEqual(self.setup().returncode, 0)
-        self.assertEqual(before, [p.read_bytes() for p in paths])
-        for p in paths[1:]:
-            self.assertEqual(p.stat().st_mode & 0o777, 0o600)
-
-    def test_setup_rejects_empty_existing_secret(self):
-        (self.stack / 'secrets').mkdir()
-        secret = self.stack / 'secrets/datastore-encryption-key'
-        secret.touch()
-        self.assertNotEqual(self.setup().returncode, 0)
-        self.assertEqual(secret.read_bytes(), b'')
-
-    def render(self, subnet):
-        self.assertEqual(self.setup().returncode, 0)
-        rendered = self.root / 'run/config.yaml'
-        script = (ROOT / 'netbird/entrypoint.sh').read_text()
-        replacements = {
-            '/opt/netbird/config.template.yaml': str(self.stack / 'config.template.yaml'),
-            '/run/netbird/config.yaml': str(rendered),
-            '/run/secrets/relay_auth_secret': str(self.stack / 'secrets/relay-auth-secret'),
-            '/run/secrets/datastore_encryption_key': str(self.stack / 'secrets/datastore-encryption-key'),
-            '/go/bin/netbird-server': '/bin/true',
-        }
-        for original, local in replacements.items():
-            script = script.replace(original, local)
-        result = subprocess.run(  # noqa: S603 - repository renderer, with test-local paths
-            ['/bin/sh', '-c', script, 'entrypoint', '--config', str(rendered)],
-            env=dict(self.env, NETBIRD_DOMAIN='nb.example.com', NETBIRD_PROXY_SUBNET=subnet),
-            capture_output=True,
-            check=False,
-        )
-        return result, rendered
-
-    def test_renderer_replaces_placeholders_and_restricts_file_permissions(self):
-        result, rendered = self.render('172.20.0.0/16')
-        self.assertEqual(result.returncode, 0, result.stderr)
-        self.assertNotIn('__NETBIRD_', rendered.read_text())
-        self.assertIn('nb.example.com', rendered.read_text())
-        self.assertEqual(rendered.stat().st_mode & 0o777, 0o600)
-
-    def test_renderer_rejects_auto_and_default_route(self):
-        for subnet in ('auto', '0.0.0.0/0', '999.1.1.1/24'):
-            with self.subTest(subnet=subnet):
-                result, _ = self.render(subnet)
-                self.assertNotEqual(result.returncode, 0)
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_session_keeper.py

@@ -0,0 +1,74 @@
+"""Session publication checks without Redis, the EDU website, or credentials."""
+
+import importlib.util
+import sys
+import unittest
+from pathlib import Path
+from unittest.mock import Mock, patch
+
+SCRIPT = Path(__file__).resolve().parents[1] / 'edu_master/phpsessid-bot/bot.py'
+spec = importlib.util.spec_from_file_location('session_keeper', SCRIPT)
+bot = importlib.util.module_from_spec(spec)
+with patch.dict(sys.modules, {'redis': Mock(), 'requests': Mock()}):
+    spec.loader.exec_module(bot)
+
+
+class SessionKeeperTests(unittest.TestCase):
+    def setUp(self):
+        self.session = Mock()
+        self.session.get.return_value.status_code = 200
+        self.session.cookies.get.return_value = 'test-cookie'
+        self.redis = Mock()
+        self.touch = patch.object(bot, 'touch_success_file').start()
+        self.addCleanup(patch.stopall)
+
+    def test_verified_cookie_expires_and_is_not_logged(self):
+        with self.assertLogs(bot.logger, level='INFO') as logs:
+            self.assertTrue(bot.refresh_session(self.session, self.redis))
+        self.redis.set.assert_called_once_with('EDU_PHPSESSID', 'test-cookie', ex=bot.INTERVAL * 120)
+        self.touch.assert_called_once()
+        self.assertNotIn('test-cookie', '\n'.join(logs.output))
+        self.assertEqual(self.session.post.call_args.kwargs['timeout'], (10, 30))
+        self.assertEqual(self.session.get.call_args.kwargs['timeout'], (10, 30))
+
+    def test_redirect_does_not_publish(self):
+        self.session.get.return_value.status_code = 302
+        self.assertFalse(bot.refresh_session(self.session, self.redis))
+        self.redis.set.assert_not_called()
+        self.touch.assert_not_called()
+
+    def test_missing_cookie_does_not_mark_success(self):
+        self.session.cookies.get.return_value = None
+        self.assertFalse(bot.refresh_session(self.session, self.redis))
+        self.redis.set.assert_not_called()
+        self.touch.assert_not_called()
+
+    def test_redis_failure_does_not_mark_success(self):
+        self.redis.set.side_effect = OSError('redis unavailable')
+        with self.assertRaises(OSError):
+            bot.refresh_session(self.session, self.redis)
+        self.touch.assert_not_called()
+
+    def test_http_timeout_does_not_publish(self):
+        self.session.post.side_effect = TimeoutError('EDU unavailable')
+        with self.assertRaises(TimeoutError):
+            bot.refresh_session(self.session, self.redis)
+        self.redis.set.assert_not_called()
+        self.touch.assert_not_called()
+
+    def test_missing_credentials_fail_before_network_access(self):
+        with patch.object(bot, 'LOGIN', None), self.assertRaises(ValueError):
+            bot.main()
+
+    def test_nonpositive_interval_fails_before_network_access(self):
+        with (
+            patch.object(bot, 'LOGIN', 'test'),
+            patch.object(bot, 'PASSWORD', 'test'),
+            patch.object(bot, 'INTERVAL', 0),
+            self.assertRaises(ValueError),
+        ):
+            bot.main()
+
+
+if __name__ == '__main__':
+    unittest.main()

vaultwarden/k8s/vaultwarden.yaml

@@ -13,8 +13,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: vaultwarden-deployment
   namespace: vaultwarden
 spec:

vpn/xui/k8s/xui.yaml

@@ -20,8 +20,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    reloader.stakater.com/auto: "true"
   name: xui-deployment
   namespace: xui
 spec: