From ca869880041abecdee49e3b2570e67998db10825 Mon Sep 17 00:00:00 2001 From: Neelanjan Manna Date: Tue, 18 Apr 2023 13:03:41 +0530 Subject: [PATCH] adds probe units to probe run properties (#595) Signed-off-by: neelanjan00 --- scenarios/podtato-head/workflow.yaml | 4 +- scenarios/podtato-head/workflow_cron.yaml | 4 +- workflows/bank-of-anthos/workflow.yaml | 24 +++--- workflows/bank-of-anthos/workflow_cron.yaml | 4 +- workflows/podtato-head/workflow.yaml | 4 +- workflows/podtato-head/workflow_cron.yaml | 4 +- workflows/sock-shop-promProbe/workflow.yaml | 50 ++++++------ .../sock-shop-promProbe/workflow_cron.yaml | 50 ++++++------ workflows/sock-shop/workflow.yaml | 78 +++++++++---------- workflows/sock-shop/workflow_cron.yaml | 60 +++++++------- 10 files changed, 141 insertions(+), 141 deletions(-) diff --git a/scenarios/podtato-head/workflow.yaml b/scenarios/podtato-head/workflow.yaml index b3d24ae..b8165d4 100644 --- a/scenarios/podtato-head/workflow.yaml +++ b/scenarios/podtato-head/workflow.yaml @@ -82,8 +82,8 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 components: env: diff --git a/scenarios/podtato-head/workflow_cron.yaml b/scenarios/podtato-head/workflow_cron.yaml index 97bfb15..099a050 100644 --- a/scenarios/podtato-head/workflow_cron.yaml +++ b/scenarios/podtato-head/workflow_cron.yaml @@ -86,8 +86,8 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 components: env: diff --git a/workflows/bank-of-anthos/workflow.yaml b/workflows/bank-of-anthos/workflow.yaml index 4718e4e..f4f105f 100644 --- a/workflows/bank-of-anthos/workflow.yaml +++ b/workflows/bank-of-anthos/workflow.yaml @@ -42,8 +42,8 @@ spec: command: [sh, -c] args: - "kubectl apply -f https://hub.litmuschaos.io/api/chaos/master?file=charts/generic/experiments.yaml -n - {{workflow.parameters.adminModeNamespace}} ; sleep 30" - + {{workflow.parameters.adminModeNamespace}} ; sleep 30" + - name: pod-network-loss inputs: artifacts: @@ -84,35 +84,35 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: - name: TOTAL_CHAOS_DURATION - value: '90' + value: '90' - name: NETWORK_INTERFACE value: 'eth0' - name: NETWORK_PACKET_LOSS_PERCENTAGE value: '100' - name: CONTAINER_RUNTIME - value: 'containerd' + value: 'containerd' - name: SOCKET_PATH - value: '/run/containerd/containerd.sock' + value: '/run/containerd/containerd.sock' container: image: litmuschaos/litmus-checker:latest - args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"] + args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"] - name: delete-application container: image: litmuschaos/litmus-app-deployer:latest - args: ["-namespace=bank","-typeName=resilient","-operation=delete", "-app=bank-of-anthos"] - + args: ["-namespace=bank","-typeName=resilient","-operation=delete", "-app=bank-of-anthos"] + - name: revert-chaos container: image: litmuschaos/k8s:latest command: [sh, -c] - args: - [ + args: + [ "kubectl delete chaosengine pod-network-loss-chaos -n {{workflow.parameters.adminModeNamespace}}", ] diff --git a/workflows/bank-of-anthos/workflow_cron.yaml b/workflows/bank-of-anthos/workflow_cron.yaml index 3549ca1..e9adbcb 100644 --- a/workflows/bank-of-anthos/workflow_cron.yaml +++ b/workflows/bank-of-anthos/workflow_cron.yaml @@ -88,8 +88,8 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: diff --git a/workflows/podtato-head/workflow.yaml b/workflows/podtato-head/workflow.yaml index b3d24ae..b8165d4 100644 --- a/workflows/podtato-head/workflow.yaml +++ b/workflows/podtato-head/workflow.yaml @@ -82,8 +82,8 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 components: env: diff --git a/workflows/podtato-head/workflow_cron.yaml b/workflows/podtato-head/workflow_cron.yaml index 97bfb15..099a050 100644 --- a/workflows/podtato-head/workflow_cron.yaml +++ b/workflows/podtato-head/workflow_cron.yaml @@ -86,8 +86,8 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 components: env: diff --git a/workflows/sock-shop-promProbe/workflow.yaml b/workflows/sock-shop-promProbe/workflow.yaml index e8e2fd0..f407dda 100644 --- a/workflows/sock-shop-promProbe/workflow.yaml +++ b/workflows/sock-shop-promProbe/workflow.yaml @@ -94,10 +94,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -108,8 +108,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -164,10 +164,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -178,8 +178,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -235,10 +235,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -249,8 +249,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -308,10 +308,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -322,8 +322,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -382,10 +382,10 @@ spec: operation: "present" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -396,8 +396,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: diff --git a/workflows/sock-shop-promProbe/workflow_cron.yaml b/workflows/sock-shop-promProbe/workflow_cron.yaml index 1c8ec7e..ff24599 100644 --- a/workflows/sock-shop-promProbe/workflow_cron.yaml +++ b/workflows/sock-shop-promProbe/workflow_cron.yaml @@ -98,10 +98,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -112,8 +112,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -168,10 +168,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -182,8 +182,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -239,10 +239,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -253,8 +253,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -312,10 +312,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -326,8 +326,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: @@ -386,10 +386,10 @@ spec: operation: "present" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-probe-success" type: "promProbe" promProbe/inputs: @@ -400,8 +400,8 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 components: env: diff --git a/workflows/sock-shop/workflow.yaml b/workflows/sock-shop/workflow.yaml index f4cbc1e..24076ce 100644 --- a/workflows/sock-shop/workflow.yaml +++ b/workflows/sock-shop/workflow.yaml @@ -94,10 +94,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -108,10 +108,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 10 + initialDelay: 10s components: env: #number of cpu cores to be consumed @@ -165,10 +165,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -179,10 +179,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 10 + initialDelay: 10s components: env: - name: MEMORY_CONSUMPTION @@ -237,10 +237,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -251,10 +251,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 2 + initialDelay: 2s components: env: - name: TOTAL_CHAOS_DURATION @@ -310,10 +310,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -324,25 +324,25 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 2 + initialDelay: 2s components: env: - name: TOTAL_CHAOS_DURATION - value: '30' + value: '30' - name: NETWORK_INTERFACE value: 'eth0' - name: NETWORK_PACKET_LOSS_PERCENTAGE value: '100' - name: CONTAINER_RUNTIME - value: 'containerd' + value: 'containerd' - name: SOCKET_PATH - value: '/run/containerd/containerd.sock' + value: '/run/containerd/containerd.sock' container: image: litmuschaos/litmus-checker:latest - args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"] + args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"] - name: disk-fill inputs: @@ -385,10 +385,10 @@ spec: operation: "present" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -399,10 +399,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 1 + initialDelay: 1s components: env: - name: FILL_PERCENTAGE @@ -410,7 +410,7 @@ spec: - name: TARGET_CONTAINER value: '' - name: TOTAL_CHAOS_DURATION - value: '30' + value: '30' container: image: litmuschaos/litmus-checker:latest args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"] @@ -428,13 +428,13 @@ spec: - name: delete-loadtest container: image: litmuschaos/litmus-app-deployer:latest - args: ["-namespace=loadtest","-operation=delete", "-app=loadtest"] - + args: ["-namespace=loadtest","-operation=delete", "-app=loadtest"] + - name: revert-chaos container: image: litmuschaos/k8s:latest command: [sh, -c] - args: - [ + args: + [ "kubectl delete chaosengine pod-memory-hog-chaos pod-cpu-hog-chaos catalogue-pod-delete-chaos pod-network-loss-chaos -n {{workflow.parameters.adminModeNamespace}}", ] \ No newline at end of file diff --git a/workflows/sock-shop/workflow_cron.yaml b/workflows/sock-shop/workflow_cron.yaml index 02353d7..48417d9 100644 --- a/workflows/sock-shop/workflow_cron.yaml +++ b/workflows/sock-shop/workflow_cron.yaml @@ -98,10 +98,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -112,10 +112,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 10 + initialDelay: 10s components: env: #number of cpu cores to be consumed @@ -169,10 +169,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -183,10 +183,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 10 + initialDelay: 10s components: env: - name: MEMORY_CONSUMPTION @@ -241,10 +241,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -255,10 +255,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 2 + initialDelay: 2s components: env: - name: TOTAL_CHAOS_DURATION @@ -314,10 +314,10 @@ spec: responseCode: "200" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 12 + probeTimeout: 1s + interval: 100ms attempt: 3 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -328,10 +328,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 2 + initialDelay: 2s components: env: - name: TOTAL_CHAOS_DURATION @@ -389,10 +389,10 @@ spec: operation: "present" mode: "Continuous" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 1 - probePollingInterval: 1 + probePollingInterval: 1s - name: "check-benchmark" type: "cmdProbe" cmdProbe/inputs: @@ -403,10 +403,10 @@ spec: value: "100" mode: "Edge" runProperties: - probeTimeout: 1000 - interval: 1 + probeTimeout: 1s + interval: 100ms attempt: 2 - initialDelaySeconds: 1 + initialDelay: 1s components: env: - name: FILL_PERCENTAGE