Merge pull request #61 from bart0sh/PR001-demo-handle-SIGTERM

demos: handle SIGTERM to avoid long termination

Author: k8s-ci-robot

demo/gpu-test1.yaml

@@ -33,7 +33,7 @@ spec:
   - name: ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: gpu
@@ -54,7 +54,7 @@ spec:
   - name: ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: gpu

demo/gpu-test2.yaml

@@ -35,7 +35,7 @@ spec:
   - name: ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: gpus

demo/gpu-test3.yaml

@@ -31,14 +31,14 @@ spec:
   - name: ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpu
   - name: ctr1
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpu

demo/gpu-test4.yaml

@@ -32,7 +32,7 @@ spec:
   - name: ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpu
@@ -53,7 +53,7 @@ spec:
   - name: ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpu

demo/gpu-test5.yaml

@@ -54,31 +54,31 @@ spec:
   - name: ts-ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpus
         request: ts-gpu
   - name: ts-ctr1
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpus
         request: ts-gpu
   - name: sp-ctr0
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpus
         request: sp-gpu
   - name: sp-ctr1
     image: ubuntu:22.04
     command: ["bash", "-c"]
-    args: ["export; sleep 9999"]
+    args: ["export; trap 'exit 0' TERM; sleep 9999 & wait"]
     resources:
       claims:
       - name: shared-gpus

test/e2e/e2e.sh

@@ -63,4 +63,12 @@ if [ $gpu_test_5 != 1 ]; then
     exit 1
 fi
 
+# test that deletion is fast (less than the default grace period of 30s)
+# see https://github.com/kubernetes/kubernetes/issues/127188 for details
+kubectl delete -f demo/gpu-test1.yaml --timeout=25s
+kubectl delete -f demo/gpu-test2.yaml --timeout=25s
+kubectl delete -f demo/gpu-test3.yaml --timeout=25s
+kubectl delete -f demo/gpu-test4.yaml --timeout=25s
+kubectl delete -f demo/gpu-test5.yaml --timeout=25s
+
 echo "test ran successfully"