diff --git a/k8s/tasks.yml b/k8s/tasks.yml index fd106ce..e373169 100644 --- a/k8s/tasks.yml +++ b/k8s/tasks.yml @@ -4,9 +4,12 @@ metadata: name: tasks spec: containers: - - name: flush + - name: connect image: git.nyeki.dev/payphone/payphone-tasks:latest - command: ["uv", "run", "--no-dev", "tasks.py", "flush"] + command: ["uv", "run", "--no-dev", "tasks.py", "connect"] + envFrom: + - secretRef: + name: bot-secrets resources: requests: memory: "250Mi" @@ -14,19 +17,9 @@ spec: limits: memory: "1Gi" cpu: "1" - - name: delete-accounts + - name: expire image: git.nyeki.dev/payphone/payphone-tasks:latest - command: ["uv", "run", "--no-dev", "tasks.py", "delete-accounts"] - resources: - requests: - memory: "250Mi" - cpu: "100m" - limits: - memory: "1Gi" - cpu: "1" - - name: hangup-inactive-calls - image: git.nyeki.dev/payphone/payphone-tasks:latest - command: ["uv", "run", "--no-dev", "tasks.py", "hangup-inactive-calls"] + command: ["uv", "run", "--no-dev", "tasks.py", "expire"] envFrom: - secretRef: name: bot-secrets diff --git a/scripts/deploy.py b/scripts/deploy.py index 0e03007..6320c07 100644 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -31,17 +31,16 @@ for tag in tags: if version > latest_version: latest_version = version -print(f"Updating to tag v{version}...") +print(f"Updating to tag v{latest_version}...") os.system(f"git pull https://{username}:{password}@git.nyeki.dev/payphone/payphone") os.system( - f"microk8s kubectl set image sts/bot bot=git.nyeki.dev/payphone/payphone-shard:v{version}" + f"microk8s kubectl set image sts/bot bot=git.nyeki.dev/payphone/payphone-shard:v{latest_version}" ) os.system( f""" -microk8s kubectl set image deploy/tasks \ - flush=git.nyeki.dev/payphone/payphone-shard:v{version} \ - delete-accounts=git.nyeki.dev/payphone/payphone-shard:v{version} \ - hangup-inactive-calls=git.nyeki.dev/payphone/payphone-shard:v{version} +microk8s kubectl set image pod/tasks \ + connect=git.nyeki.dev/payphone/payphone-shard:v{latest_version} \ + expire=git.nyeki.dev/payphone/payphone-shard:v{latest_version} \ """ )