bstein/titan-iac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comms: retry mas jobs and rerun

Browse Source
This commit is contained in:
Brad Stein 2026-01-17 02:34:36 -03:00
parent 6028d82aa3
commit c5b8396bd8
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/comms/mas-local-users-ensure-job.yaml
View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: mas-local-users-ensure-12 name: mas-local-users-ensure-13
namespace: comms namespace: comms
spec: spec:
backoffLimit: 1 backoffLimit: 1
@ -109,6 +109,17 @@ spec:
AUTH_BASE = "http://matrix-authentication-service:8080" AUTH_BASE = "http://matrix-authentication-service:8080"
SERVER_NAME = "live.bstein.dev" SERVER_NAME = "live.bstein.dev"
def wait_for_service(url):
last = None
for attempt in range(1, 11):
try:
requests.get(url, timeout=10)
return
except Exception as exc: # noqa: BLE001
last = exc
time.sleep(attempt * 2)
raise RuntimeError(f"MAS service not reachable: {last}")
def admin_token(): def admin_token():
with open(MAS_ADMIN_CLIENT_SECRET_FILE, "r", encoding="utf-8") as f: with open(MAS_ADMIN_CLIENT_SECRET_FILE, "r", encoding="utf-8") as f:
secret = f.read().strip() secret = f.read().strip()
@ -198,6 +209,7 @@ spec:
if r.status_code != 200: if r.status_code != 200:
raise RuntimeError(f"login failed for {username}: {r.status_code} {r.text}") raise RuntimeError(f"login failed for {username}: {r.status_code} {r.text}")
wait_for_service(MAS_ADMIN_API_BASE)
token = admin_token() token = admin_token()
ensure_user(token, os.environ["SEEDER_USER"], os.environ["SEEDER_PASS"]) ensure_user(token, os.environ["SEEDER_USER"], os.environ["SEEDER_PASS"])
ensure_user(token, os.environ["BOT_USER"], os.environ["BOT_PASS"]) ensure_user(token, os.environ["BOT_USER"], os.environ["BOT_PASS"])

14
services/comms/othrys-kick-numeric-job.yaml
View File

@ -2,7 +2,7 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: othrys-kick-numeric-7 name: othrys-kick-numeric-8
namespace: comms namespace: comms
spec: spec:
backoffLimit: 0 backoffLimit: 0
@ -107,6 +107,17 @@ spec:
def auth(token): def auth(token):
return {"Authorization": f"Bearer {token}"} return {"Authorization": f"Bearer {token}"}
def wait_for_service(url):
last = None
for attempt in range(1, 11):
try:
requests.get(url, timeout=10)
return
except Exception as exc: # noqa: BLE001
last = exc
time.sleep(attempt * 2)
raise SystemExit(f"MAS service not reachable: {last}")
def login(user, password): def login(user, password):
r = requests.post( r = requests.post(
f"{AUTH_BASE}/_matrix/client/v3/login", f"{AUTH_BASE}/_matrix/client/v3/login",
@ -154,6 +165,7 @@ spec:
if r.status_code not in (200, 202): if r.status_code not in (200, 202):
raise SystemExit(f"kick {user_id} failed: {r.status_code} {r.text}") raise SystemExit(f"kick {user_id} failed: {r.status_code} {r.text}")
wait_for_service(f"{AUTH_BASE}/_matrix/client/versions")
token = login(SEEDER_USER, SEEDER_PASS) token = login(SEEDER_USER, SEEDER_PASS)
room_id = resolve_alias(token, ROOM_ALIAS) room_id = resolve_alias(token, ROOM_ALIAS)
for user_id in list_members(token, room_id): for user_id in list_members(token, room_id):