diff --git a/backend/btrixcloud/k8sapi.py b/backend/btrixcloud/k8sapi.py index c724a72c..bfaaabb6 100644 --- a/backend/btrixcloud/k8sapi.py +++ b/backend/btrixcloud/k8sapi.py @@ -280,6 +280,18 @@ class K8sAPI: traceback.print_exc() return {"error": str(exc)} + async def unsuspend_k8s_job(self, name) -> dict: + """unsuspend k8s Job""" + try: + await self.batch_api.patch_namespaced_job( + name=name, namespace=self.namespace, body={"spec": {"suspend": False}} + ) + return {"success": True} + # pylint: disable=broad-except + except Exception as exc: + traceback.print_exc() + return {"error": str(exc)} + async def print_pod_logs(self, pod_names, lines=100): """print pod logs""" for pod in pod_names: diff --git a/backend/btrixcloud/operator/cronjobs.py b/backend/btrixcloud/operator/cronjobs.py index 929d7920..9a411431 100644 --- a/backend/btrixcloud/operator/cronjobs.py +++ b/backend/btrixcloud/operator/cronjobs.py @@ -42,6 +42,8 @@ class CronJobOperator(BaseOperator): "completionTime": finished, } + self.run_task(self.k8s.unsuspend_k8s_job(metadata.get("name"))) + return MCDecoratorSyncResponse( attachments=[], # set on job to match default behavior when job finishes diff --git a/backend/btrixcloud/version.py b/backend/btrixcloud/version.py index 751e7026..b494ff58 100644 --- a/backend/btrixcloud/version.py +++ b/backend/btrixcloud/version.py @@ -1,3 +1,3 @@ """current version""" -__version__ = "1.14.4" +__version__ = "1.14.5" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 503f16c0..3ca36d1f 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -5,7 +5,7 @@ type: application icon: https://webrecorder.net/assets/icon.png # Browsertrix and Chart Version -version: v1.14.4 +version: v1.14.5 dependencies: - name: btrix-admin-logging diff --git a/chart/values.yaml b/chart/values.yaml index 8b708447..b6faa823 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -103,7 +103,7 @@ replica_deletion_delay_days: 0 # API Image # ========================================= -backend_image: "docker.io/webrecorder/browsertrix-backend:1.14.4" +backend_image: "docker.io/webrecorder/browsertrix-backend:1.14.5" backend_pull_policy: "Always" backend_password_secret: "PASSWORD!" @@ -161,7 +161,7 @@ backend_avg_memory_threshold: 95 # Nginx Image # ========================================= -frontend_image: "docker.io/webrecorder/browsertrix-frontend:1.14.4" +frontend_image: "docker.io/webrecorder/browsertrix-frontend:1.14.5" frontend_pull_policy: "Always" frontend_cpu: "10m" diff --git a/frontend/package.json b/frontend/package.json index ccbfae1a..ebe43cd0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "browsertrix-frontend", - "version": "1.14.4", + "version": "1.14.5", "main": "index.ts", "license": "AGPL-3.0-or-later", "dependencies": { diff --git a/version.txt b/version.txt index 4e00d0ac..24a57f28 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.14.4 +1.14.5