From 39e7cbd19f191b9396fcfeae4d3dd6827589810f Mon Sep 17 00:00:00 2001
From: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
Date: Thu, 24 Sep 2020 10:38:50 +0530
Subject: [PATCH] Added Litmus-Checker to workflows (#334)

Signed-off-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
---
 cron-workflows/node-cpu-hog/workflow.yaml    |  7 ++--
 cron-workflows/node-memory-hog/workflow.yaml |  7 ++--
 workflows/kube-proxy-all/workflow.yaml       | 37 ++++++--------------
 workflows/node-cpu-hog/workflow.yaml         | 10 ++----
 workflows/node-memory-hog/workflow.yaml      | 10 ++----
 workflows/pod-cpu-hog/workflow.yaml          | 10 ++----
 workflows/pod-delete/workflow.yaml           | 10 ++----
 workflows/pod-memory-hog/workflow.yaml       | 10 ++----
 8 files changed, 32 insertions(+), 69 deletions(-)

diff --git a/cron-workflows/node-cpu-hog/workflow.yaml b/cron-workflows/node-cpu-hog/workflow.yaml
index 6058a4d..5ff700a 100644
--- a/cron-workflows/node-cpu-hog/workflow.yaml
+++ b/cron-workflows/node-cpu-hog/workflow.yaml
@@ -22,7 +22,7 @@ spec:
       inputs:
         artifacts:
         - name: run-node-cpu-hog
-          path: /tmp/chaosengine-1.yaml
+          path: /tmp/chaosengine.yaml
           raw:
             data: |
               apiVersion: litmuschaos.io/v1alpha1
@@ -50,6 +50,5 @@ spec:
                           - name: NODE_CPU_CORE
                             value: ""
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args: ['kubectl apply -f /tmp/chaosengine-1.yaml -n litmus']
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
diff --git a/cron-workflows/node-memory-hog/workflow.yaml b/cron-workflows/node-memory-hog/workflow.yaml
index 8f165ab..4b59924 100644
--- a/cron-workflows/node-memory-hog/workflow.yaml
+++ b/cron-workflows/node-memory-hog/workflow.yaml
@@ -23,7 +23,7 @@ spec:
       inputs:
         artifacts:
         - name: run-node-memory-hog
-          path: /tmp/chaosengine-2.yaml
+          path: /tmp/chaosengine.yaml
           raw:
             data: |
               apiVersion: litmuschaos.io/v1alpha1
@@ -51,6 +51,5 @@ spec:
                           - name: MEMORY_PERCENTAGE
                             value: "90"
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args: ['kubectl apply -f /tmp/chaosengine-2.yaml -n litmus']
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
diff --git a/workflows/kube-proxy-all/workflow.yaml b/workflows/kube-proxy-all/workflow.yaml
index 6ba59ec..b068817 100644
--- a/workflows/kube-proxy-all/workflow.yaml
+++ b/workflows/kube-proxy-all/workflow.yaml
@@ -70,11 +70,8 @@ spec:
                             - name: TOTAL_CHAOS_DURATION
                               value: '60' # in seconds
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          - "kubectl apply -f /tmp/chaosengine-node-cpu-hog.yaml -n
-            {{workflow.parameters.adminModeNamespace}} | sleep 90"
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine-node-cpu-hog.yaml","-saveName=/tmp/engine-name"]
 
     - name: pod-memory-hog
       inputs:
@@ -111,11 +108,8 @@ spec:
                             - name: TOTAL_CHAOS_DURATION
                               value: '60' # in seconds
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          - "kubectl apply -f /tmp/chaosengine-pod-memory-hog.yaml -n
-            {{workflow.parameters.adminModeNamespace}} | sleep 90"
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine-pod-memory-hog.yaml","-saveName=/tmp/engine-name"]
 
     - name: pod-cpu-hog
       inputs:
@@ -152,11 +146,8 @@ spec:
                             - name: TOTAL_CHAOS_DURATION
                               value: '60' # in seconds
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          - "kubectl apply -f /tmp/chaosengine-pod-cpu-hog.yaml -n
-            {{workflow.parameters.adminModeNamespace}} | sleep 90"
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine-pod-cpu-hog.yaml","-saveName=/tmp/engine-name"]
 
     - name: node-memory-hog
       inputs:
@@ -190,11 +181,8 @@ spec:
                             - name: TOTAL_CHAOS_DURATION
                               value: '60' # in seconds
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          - "kubectl apply -f /tmp/chaosengine-node-memory-hog.yaml -n
-            {{workflow.parameters.adminModeNamespace}} | sleep 90"
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine-node-memory-hog.yaml","-saveName=/tmp/engine-name"]
 
     - name: pod-delete
       inputs:
@@ -230,16 +218,13 @@ spec:
                             - name: FORCE
                               value: "false"
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          - "kubectl apply -f /tmp/chaosengine-pod-delete.yaml -n
-            {{workflow.parameters.adminModeNamespace}} | sleep 90"
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine-pod-delete.yaml","-saveName=/tmp/engine-name"]
 
     - name: revert-kube-proxy-chaos
       container:
         image: lachlanevenson/k8s-kubectl
         command: [sh, -c]
         args:
-          - "sleep 100 | kubectl delete chaosengines --all -n
+          - "kubectl delete chaosengines --all -n
             {{workflow.parameters.adminModeNamespace}}"
diff --git a/workflows/node-cpu-hog/workflow.yaml b/workflows/node-cpu-hog/workflow.yaml
index 4fb7e20..191790d 100644
--- a/workflows/node-cpu-hog/workflow.yaml
+++ b/workflows/node-cpu-hog/workflow.yaml
@@ -138,12 +138,8 @@ spec:
                             - name: TOTAL_CHAOS_DURATION
                               value: '60' # in seconds
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          [
-            'kubectl apply -f /tmp/chaosengine.yaml -n {{workflow.parameters.adminModeNamespace}} | echo "sleeping for 120s" | sleep 120 ',
-          ]
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
 
     - name: revert-chaos
       container:
@@ -151,5 +147,5 @@ spec:
         command: [sh, -c]
         args:
           [
-            " sleep 20 | kubectl delete chaosengine kube-proxy-node-cpu-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
+            "kubectl delete chaosengine kube-proxy-node-cpu-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
           ]
diff --git a/workflows/node-memory-hog/workflow.yaml b/workflows/node-memory-hog/workflow.yaml
index 0e17591..d440ba6 100644
--- a/workflows/node-memory-hog/workflow.yaml
+++ b/workflows/node-memory-hog/workflow.yaml
@@ -138,12 +138,8 @@ spec:
                             - name: TOTAL_CHAOS_DURATION
                               value: '60' # in seconds
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          [
-            'kubectl apply -f /tmp/chaosengine.yaml -n {{workflow.parameters.adminModeNamespace}} | echo "sleeping for 120s" | sleep 120 ',
-          ]
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
 
     - name: revert-chaos
       container:
@@ -151,5 +147,5 @@ spec:
         command: [sh, -c]
         args:
           [
-            " sleep 20 | kubectl delete chaosengine kube-proxy-node-memory-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
+            "kubectl delete chaosengine kube-proxy-node-memory-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
           ]
diff --git a/workflows/pod-cpu-hog/workflow.yaml b/workflows/pod-cpu-hog/workflow.yaml
index 0090278..decd28f 100644
--- a/workflows/pod-cpu-hog/workflow.yaml
+++ b/workflows/pod-cpu-hog/workflow.yaml
@@ -139,12 +139,8 @@ spec:
                             - name: CHAOS_KILL_COMMAND
                               value: "kill -9 $(ps afx | grep \"[md5sum] /dev/zero\" | awk '{print$1}' | tr '\n' ' ')"
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          [
-            'kubectl apply -f /tmp/chaosengine.yaml -n {{workflow.parameters.adminModeNamespace}} | echo "sleeping for 120s" | sleep 120 ',
-          ]
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
 
     - name: revert-chaos
       container:
@@ -152,5 +148,5 @@ spec:
         command: [sh, -c]
         args:
           [
-            " sleep 20 | kubectl delete chaosengine kube-proxy-pod-cpu-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
+            "kubectl delete chaosengine kube-proxy-pod-cpu-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
           ]
diff --git a/workflows/pod-delete/workflow.yaml b/workflows/pod-delete/workflow.yaml
index 1331d48..45c1f6c 100644
--- a/workflows/pod-delete/workflow.yaml
+++ b/workflows/pod-delete/workflow.yaml
@@ -139,12 +139,8 @@ spec:
                             - name: FORCE
                               value: "false"
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          [
-            'kubectl apply -f /tmp/chaosengine.yaml -n {{workflow.parameters.adminModeNamespace}} | echo "sleeping for 120s" | sleep 120 ',
-          ]
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
 
     - name: revert-chaos
       container:
@@ -152,5 +148,5 @@ spec:
         command: [sh, -c]
         args:
           [
-            " sleep 20 | kubectl delete chaosengine kube-proxy-pod-delete-chaos -n {{workflow.parameters.adminModeNamespace}}",
+            "kubectl delete chaosengine kube-proxy-pod-delete-chaos -n {{workflow.parameters.adminModeNamespace}}",
           ]
diff --git a/workflows/pod-memory-hog/workflow.yaml b/workflows/pod-memory-hog/workflow.yaml
index a97d00d..c7b1220 100644
--- a/workflows/pod-memory-hog/workflow.yaml
+++ b/workflows/pod-memory-hog/workflow.yaml
@@ -140,12 +140,8 @@ spec:
                             - name: CHAOS_KILL_COMMAND
                               value: "kill -9 $(ps afx | grep \"[dd] if /dev/zero\" | awk '{print $1}' | tr '\n' ' ')"
       container:
-        image: lachlanevenson/k8s-kubectl
-        command: [sh, -c]
-        args:
-          [
-            'kubectl apply -f /tmp/chaosengine.yaml -n {{workflow.parameters.adminModeNamespace}} | echo "sleeping for 120s" | sleep 120 ',
-          ]
+        image: litmuschaos/litmus-checker:latest
+        args: ["-file=/tmp/chaosengine.yaml","-saveName=/tmp/engine-name"]
 
     - name: revert-chaos
       container:
@@ -153,5 +149,5 @@ spec:
         command: [sh, -c]
         args:
           [
-            " sleep 20 | kubectl delete chaosengine kube-proxy-pod-memory-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
+            "kubectl delete chaosengine kube-proxy-pod-memory-hog-chaos -n {{workflow.parameters.adminModeNamespace}}",
           ]