From cfea744338a1a622f9833502a8b89866c2d784ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 2 Jul 2024 16:29:49 +0000
Subject: [PATCH] Move stuck notebooks cleaner script to notebooks playbook
---
cesnet-central/playbooks/k8s.yaml | 5 -----
cesnet-central/playbooks/notebooks.yaml | 8 +++++++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cesnet-central/playbooks/k8s.yaml b/cesnet-central/playbooks/k8s.yaml
index 28d0277..26daba2 100644
--- a/cesnet-central/playbooks/k8s.yaml
+++ b/cesnet-central/playbooks/k8s.yaml
@@ -167,11 +167,6 @@
dest: /etc/profile.d/k8s-cheats.sh
src: files//etc/profile.d/k8s-cheats.sh
mode: preserve
- - name: K8s pods cleaner
- copy:
- dest: /usr/local/bin/k8s-pods-cleaner.sh
- src: files/usr/local/bin/k8s-pods-cleaner.sh
- mode: preserve
- name: K8s network deployment
hosts: master
diff --git a/cesnet-central/playbooks/notebooks.yaml b/cesnet-central/playbooks/notebooks.yaml
index 119e676..5da0f74 100644
--- a/cesnet-central/playbooks/notebooks.yaml
+++ b/cesnet-central/playbooks/notebooks.yaml
@@ -119,13 +119,19 @@
- "../extra/*.yaml"
when: true
# Workaround for pods stuck in "Terminating" state
+ - name: K8s pods cleaner script
+ copy:
+ dest: /usr/local/bin/k8s-pods-cleaner.sh
+ src: files/usr/local/bin/k8s-pods-cleaner.sh
+ mode: preserve
+ # Workaround for pods stuck in "Terminating" state
- name: Regular cleanup of failed user notebooks pods
vars:
name: "{{ item | basename | splitext | first }}"
cron:
cron_file: "notebooks-{{ name }}-cleaner"
name: "Notebooks {{ name }} cleanup"
- minute: "*/2"
+ minute: "*"
hour: "*"
job: "KUBECONFIG=$HOME/.kube/config /usr/local/bin/k8s-pods-cleaner.sh '{{ name }}' app=jupyterhub,component=singleuser-server --yes >/dev/null 2>&1"
user: egi
--
GitLab