Skip to content

Commit 0d67dd0

Browse files
author
Paulo Guilherme Pinheiro Pereira
committed
Remove cancelation logic
1 parent 8a3c762 commit 0d67dd0

2 files changed

Lines changed: 0 additions & 25 deletions

File tree

charts/templates/django-deployment.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ spec:
3131
{{- end }}
3232
- name: DATABASE_URL
3333
value: "postgres://{{ .Values.db.username }}:{{ .Values.db.password }}@{{ .Values.db.host }}:{{ .Values.db.port }}/{{ .Values.db.name }}"
34-
- name: CONTAINER_ENGINE_EXECUTABLE
35-
value: '{{ $.Values.compute_worker.container_engine_executable }}'
36-
- name: CURRENT_NAMESPACE
37-
valueFrom:
38-
fieldRef:
39-
fieldPath: metadata.namespace
4034
volumeMounts:
4135
- name: app-state
4236
mountPath: /app/app-state

src/apps/competitions/models.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import logging
2525
logger = logging.getLogger(__name__)
2626

27-
CURRENT_NAMESPACE = os.environ.get("CURRENT_NAMESPACE", "default")
28-
CONTAINER_ENGINE = os.environ.get("CONTAINER_ENGINE_EXECUTABLE", "docker").lower()
2927

3028
class Competition(models.Model):
3129
COMPETITION = "competition"
@@ -675,23 +673,6 @@ def cancel(self, status=CANCELLED):
675673
celery_app = app_for_vhost(str(self.phase.competition.queue.vhost))
676674

677675
celery_app.control.revoke(self.celery_task_id, terminate=True)
678-
679-
if CONTAINER_ENGINE == "kubernetes":
680-
try:
681-
from kubernetes import client, config
682-
config.load_incluster_config()
683-
core_v1 = client.CoreV1Api()
684-
685-
core_v1.delete_collection_namespaced_pod(
686-
namespace=CURRENT_NAMESPACE,
687-
label_selector=f"submission_id={self.id}",
688-
body=client.V1DeleteOptions(propagation_policy="Foreground")
689-
)
690-
691-
logger.info(f"Cleaned up Kubernetes resources for submission {self.id}")
692-
except Exception as e:
693-
logger.warning(f"Could not clean up K8s resources for submission {self.id}: {e}")
694-
695676
self.status = status
696677
self.save()
697678
return True

0 commit comments

Comments
 (0)