comms: force admin token to use othrys-seeder
This commit is contained in:
parent
9662d36ad3
commit
1aceaed741
@ -1,12 +1,12 @@
|
|||||||
# services/comms/oneoffs/synapse-admin-ensure-job.yaml
|
# services/comms/oneoffs/synapse-admin-ensure-job.yaml
|
||||||
# One-off job for comms/synapse-admin-ensure-13.
|
# One-off job for comms/synapse-admin-ensure-14.
|
||||||
# Purpose: synapse admin ensure 13 (see container args/env in this file).
|
# Purpose: synapse admin ensure 14 (see container args/env in this file).
|
||||||
# Run by setting spec.suspend to false, reconcile, then set it back to true.
|
# Run by setting spec.suspend to false, reconcile, then set it back to true.
|
||||||
# Safe to delete the finished Job/pod; it should not run continuously.
|
# Safe to delete the finished Job/pod; it should not run continuously.
|
||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: Job
|
kind: Job
|
||||||
metadata:
|
metadata:
|
||||||
name: synapse-admin-ensure-13
|
name: synapse-admin-ensure-14
|
||||||
namespace: comms
|
namespace: comms
|
||||||
spec:
|
spec:
|
||||||
suspend: false
|
suspend: false
|
||||||
@ -113,8 +113,10 @@ spec:
|
|||||||
|
|
||||||
def ensure_admin_creds(token: str) -> dict:
|
def ensure_admin_creds(token: str) -> dict:
|
||||||
data = vault_get(token, "comms/synapse-admin")
|
data = vault_get(token, "comms/synapse-admin")
|
||||||
username = (data.get("username") or "").strip() or "othrys-seeder"
|
username = "othrys-seeder"
|
||||||
data["username"] = username
|
if data.get("username") != username:
|
||||||
|
data["username"] = username
|
||||||
|
data.pop("access_token", None)
|
||||||
vault_put(token, "comms/synapse-admin", data)
|
vault_put(token, "comms/synapse-admin", data)
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user