From 8bb2cabfc703604f466da4bb6c48e5344c394749 Mon Sep 17 00:00:00 2001 From: Jack Zhang Date: Mon, 4 Dec 2023 23:16:02 -0800 Subject: [PATCH 1/2] add test cronjob manifests for errors and delays --- k8s/errors/cronjob-basic-error.yaml | 4 +-- k8s/errors/cronjob-late-maybe-error.yaml | 33 ++++++++++++++++++++++++ k8s/errors/cronjob-late-success.yaml | 30 +++++++++++++++++++++ k8s/errors/cronjob-maybe-error.yaml | 30 +++++++++++++++++++++ 4 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 k8s/errors/cronjob-late-maybe-error.yaml create mode 100644 k8s/errors/cronjob-late-success.yaml create mode 100644 k8s/errors/cronjob-maybe-error.yaml diff --git a/k8s/errors/cronjob-basic-error.yaml b/k8s/errors/cronjob-basic-error.yaml index e1d275d..22cc423 100644 --- a/k8s/errors/cronjob-basic-error.yaml +++ b/k8s/errors/cronjob-basic-error.yaml @@ -22,7 +22,5 @@ spec: command: - /bin/sh - -c - - | - sleep 1 - invalid_command + - sleep 1; invalid_command restartPolicy: Never diff --git a/k8s/errors/cronjob-late-maybe-error.yaml b/k8s/errors/cronjob-late-maybe-error.yaml new file mode 100644 index 0000000..9e81621 --- /dev/null +++ b/k8s/errors/cronjob-late-maybe-error.yaml @@ -0,0 +1,33 @@ +apiVersion: batch/v1 +kind: CronJob +metadata: + name: cronjob-late-maybe-error + labels: + type: test-pod +spec: + schedule: "* * * * *" + jobTemplate: + spec: + backoffLimit: 0 + template: + metadata: + labels: + type: test-pod + run: cronjob-late-maybe-error + spec: + containers: + - name: hello + image: busybox:1.28 + imagePullPolicy: IfNotPresent + command: + - /bin/sh + - -c + - | + MINWAIT=0 + MAXWAIT=60 + sleep $((MINWAIT+RANDOM % (MAXWAIT-MINWAIT))) + sleep 3 + r=$((RANDOM%2)) + if [ $r -eq 0 ]; then echo Hello!; fi + if [ $r -eq 1 ]; then exit 1; fi + restartPolicy: Never diff --git a/k8s/errors/cronjob-late-success.yaml b/k8s/errors/cronjob-late-success.yaml new file mode 100644 index 0000000..19e07b9 --- /dev/null +++ b/k8s/errors/cronjob-late-success.yaml @@ -0,0 +1,30 @@ +apiVersion: batch/v1 +kind: CronJob +metadata: + name: cronjob-late-success + labels: + type: test-pod +spec: + schedule: "* * * * *" + jobTemplate: + spec: + template: + metadata: + labels: + type: test-pod + run: cronjob-late-success + spec: + containers: + - name: hello + image: busybox:1.28 + imagePullPolicy: IfNotPresent + command: + - /bin/sh + - -c + - | + date + MINWAIT=0 + MAXWAIT=60 + sleep $((MINWAIT+RANDOM % (MAXWAIT-MINWAIT))) + echo Hello! + restartPolicy: Never diff --git a/k8s/errors/cronjob-maybe-error.yaml b/k8s/errors/cronjob-maybe-error.yaml new file mode 100644 index 0000000..841497d --- /dev/null +++ b/k8s/errors/cronjob-maybe-error.yaml @@ -0,0 +1,30 @@ +apiVersion: batch/v1 +kind: CronJob +metadata: + name: cronjob-maybe-error + labels: + type: test-pod +spec: + schedule: "* * * * *" + jobTemplate: + spec: + backoffLimit: 0 + template: + metadata: + labels: + type: test-pod + run: cronjob-maybe-error + spec: + containers: + - name: hello + image: busybox:1.28 + imagePullPolicy: IfNotPresent + command: + - /bin/sh + - -c + - | + sleep 3 + r=$((RANDOM%2)) + if [ $r -eq 0 ]; then echo Hello!; fi + if [ $r -eq 1 ]; then exit 1; fi + restartPolicy: Never From 85e29e669952fba206b4a3535628057f01e1a895 Mon Sep 17 00:00:00 2001 From: Jack Zhang Date: Tue, 5 Dec 2023 11:34:52 -0800 Subject: [PATCH 2/2] clean up shell commands --- k8s/errors/cronjob-late-maybe-error.yaml | 3 +-- k8s/errors/cronjob-maybe-error.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/k8s/errors/cronjob-late-maybe-error.yaml b/k8s/errors/cronjob-late-maybe-error.yaml index 9e81621..ccb9a22 100644 --- a/k8s/errors/cronjob-late-maybe-error.yaml +++ b/k8s/errors/cronjob-late-maybe-error.yaml @@ -28,6 +28,5 @@ spec: sleep $((MINWAIT+RANDOM % (MAXWAIT-MINWAIT))) sleep 3 r=$((RANDOM%2)) - if [ $r -eq 0 ]; then echo Hello!; fi - if [ $r -eq 1 ]; then exit 1; fi + if [ $r -eq 0 ]; then echo Hello!; else exit 1; fi restartPolicy: Never diff --git a/k8s/errors/cronjob-maybe-error.yaml b/k8s/errors/cronjob-maybe-error.yaml index 841497d..4947789 100644 --- a/k8s/errors/cronjob-maybe-error.yaml +++ b/k8s/errors/cronjob-maybe-error.yaml @@ -25,6 +25,5 @@ spec: - | sleep 3 r=$((RANDOM%2)) - if [ $r -eq 0 ]; then echo Hello!; fi - if [ $r -eq 1 ]; then exit 1; fi + if [ $r -eq 0 ]; then echo Hello!; else exit 1; fi restartPolicy: Never