Merge branch 'master' into spring-boot-chaos

Author: Neelanjan Manna

charts/aws-ssm/experiments.yaml

@@ -1,12 +1,12 @@
 apiVersion: litmuschaos.io/v1alpha1
 description:
   message: |
-    Execute AWS SSM Chaos on given ec2 instance Tag
+    Execute AWS SSM Chaos on given ec2 instance IDs
 kind: ChaosExperiment
 metadata:
-  name: aws-ssm-chaos-by-tag
+  name: aws-ssm-chaos-by-id
   labels:
-    name: aws-ssm-chaos-by-tag
+    name: aws-ssm-chaos-by-id
     app.kubernetes.io/part-of: litmus
     app.kubernetes.io/component: chaosexperiment
     app.kubernetes.io/version: latest
@@ -46,7 +46,7 @@ spec:
     imagePullPolicy: Always
     args:
     - -c
-    - ./experiments -name aws-ssm-chaos-by-tag
+    - ./experiments -name aws-ssm-chaos-by-id
     command:
     - /bin/bash
     env:
@@ -55,14 +55,14 @@ spec:
 
     - name: CHAOS_INTERVAL
       value: '60'
-
+      
     # Period to wait before and after injection of chaos in sec
     - name: RAMP_TIME
       value: ''
 
-      # provide tag of the target ec2 instances
-      # ex: team:devops (key:value)
-    - name: EC2_INSTANCE_TAG
+    # Instance ID of the target ec2 instance
+    # Multiple IDs can also be provided as comma separated values ex: id1,id2
+    - name: EC2_INSTANCE_ID
       value: ''
 
     - name: REGION
@@ -77,10 +77,6 @@ spec:
     - name: AWS_SHARED_CREDENTIALS_FILE
       value: '/tmp/cloud_config.yml'      
 
-    # percentage of total instance to target
-    - name: INSTANCE_AFFECTED_PERC
-      value: ''      
-
     # Provide the name of ssm doc 
     # if not using the default stress docs  
     - name: DOCUMENT_NAME
@@ -113,7 +109,7 @@ spec:
     - name: MEMORY_PERCENTAGE
       value: '80'
 
-    # provide the CPU chores to comsumed
+    # provide the CPU chores to be comsumed
     # 0 will consume all the available cpu cores
     - name: CPU_CORE
       value: '0'
@@ -124,7 +120,7 @@ spec:
       value: 'litmus'  
 
     labels:
-      name: aws-ssm-chaos-by-tag
+      name: aws-ssm-chaos-by-id
       app.kubernetes.io/part-of: litmus
       app.kubernetes.io/component: experiment-job
       app.kubernetes.io/version: latest
@@ -136,12 +132,12 @@ spec:
 apiVersion: litmuschaos.io/v1alpha1
 description:
   message: |
-    Execute AWS SSM Chaos on given ec2 instance IDs
+    Execute AWS SSM Chaos on given ec2 instance Tag
 kind: ChaosExperiment
 metadata:
-  name: aws-ssm-chaos-by-id
+  name: aws-ssm-chaos-by-tag
   labels:
-    name: aws-ssm-chaos-by-id
+    name: aws-ssm-chaos-by-tag
     app.kubernetes.io/part-of: litmus
     app.kubernetes.io/component: chaosexperiment
     app.kubernetes.io/version: latest
@@ -181,7 +177,7 @@ spec:
     imagePullPolicy: Always
     args:
     - -c
-    - ./experiments -name aws-ssm-chaos-by-id
+    - ./experiments -name aws-ssm-chaos-by-tag
     command:
     - /bin/bash
     env:
@@ -190,14 +186,14 @@ spec:
 
     - name: CHAOS_INTERVAL
       value: '60'
-      
+
     # Period to wait before and after injection of chaos in sec
     - name: RAMP_TIME
       value: ''
 
-    # Instance ID of the target ec2 instance
-    # Multiple IDs can also be provided as comma separated values ex: id1,id2
-    - name: EC2_INSTANCE_ID
+      # provide tag of the target ec2 instances
+      # ex: team:devops (key:value)
+    - name: EC2_INSTANCE_TAG
       value: ''
 
     - name: REGION
@@ -212,6 +208,10 @@ spec:
     - name: AWS_SHARED_CREDENTIALS_FILE
       value: '/tmp/cloud_config.yml'      
 
+    # percentage of total instance to target
+    - name: INSTANCE_AFFECTED_PERC
+      value: ''      
+
     # Provide the name of ssm doc 
     # if not using the default stress docs  
     - name: DOCUMENT_NAME
@@ -244,7 +244,7 @@ spec:
     - name: MEMORY_PERCENTAGE
       value: '80'
 
-    # provide the CPU chores to be comsumed
+    # provide the CPU chores to comsumed
     # 0 will consume all the available cpu cores
     - name: CPU_CORE
       value: '0'
@@ -255,7 +255,7 @@ spec:
       value: 'litmus'  
 
     labels:
-      name: aws-ssm-chaos-by-id
+      name: aws-ssm-chaos-by-tag
       app.kubernetes.io/part-of: litmus
       app.kubernetes.io/component: experiment-job
       app.kubernetes.io/version: latest

charts/azure/experiments.yaml

@@ -1,12 +1,12 @@
 apiVersion: litmuschaos.io/v1alpha1
 description:
   message: |
-    Detaches disk from the VM and then re-attaches disk to the VM
+    Terminating azure VM instance
 kind: ChaosExperiment
 metadata:
-  name: azure-disk-loss
+  name: azure-instance-stop
   labels:
-    name: azure-disk-loss
+    name: azure-instance-stop
     app.kubernetes.io/part-of: litmus
     app.kubernetes.io/component: chaosexperiment
     app.kubernetes.io/version: latest
@@ -46,64 +46,65 @@ spec:
     imagePullPolicy: Always
     args:
     - -c
-    - ./experiments -name azure-disk-loss
+    - ./experiments -name azure-instance-stop
     command:
     - /bin/bash
     env:
 
     - name: TOTAL_CHAOS_DURATION
-      value: '30' 
+      value: '30'
 
     - name: CHAOS_INTERVAL
       value: '30'
 
-    - name: LIB
-      value: 'litmus'
-
     # Period to wait before and after injection of chaos in sec
     - name: RAMP_TIME
       value: ''
-    
+
+    # provide the target instance name(s) (comma separated if multiple)
+    - name: AZURE_INSTANCE_NAME
+      value: ''
+
     # provide the resource group of the instance
     - name: RESOURCE_GROUP
       value: ''
 
     # accepts enable/disable, default is disable
     - name: SCALE_SET
       value: ''
-    
-    # provide the virtual disk names (comma separated if multiple)
-    - name: VIRTUAL_DISK_NAMES
-      value: ''
-    
-    # provide the sequence type for the run. Options: serial/parallel
-    - name: SEQUENCE
-      value: 'parallel'
-    
-    # provide the path to aks credentials mounted from secret
+
+    # Provide the path of aks credentials mounted from secret  
     - name: AZURE_AUTH_LOCATION
       value: '/tmp/azure.auth'
 
+    - name: SEQUENCE
+      value: 'parallel'       
+
+    # provide the LIB
+    # only litmus supported
+    - name: LIB
+      value: 'litmus'  
+          
     labels:
-      name: azure-disk-loss
+      name: azure-instance-stop
       app.kubernetes.io/part-of: litmus
       app.kubernetes.io/component: experiment-job
       app.kubernetes.io/version: latest
-    
     secrets:
     - name: cloud-secret
       mountPath: /tmp/
 
+
 ---
 apiVersion: litmuschaos.io/v1alpha1
 description:
   message: |
-    Terminating azure VM instance
+    Detaches disk from the VM and then re-attaches disk to the VM
 kind: ChaosExperiment
 metadata:
-  name: azure-instance-stop
+  name: azure-disk-loss
   labels:
-    name: azure-instance-stop
+    name: azure-disk-loss
     app.kubernetes.io/part-of: litmus
     app.kubernetes.io/component: chaosexperiment
     app.kubernetes.io/version: latest
@@ -143,53 +144,52 @@ spec:
     imagePullPolicy: Always
     args:
     - -c
-    - ./experiments -name azure-instance-stop
+    - ./experiments -name azure-disk-loss
     command:
     - /bin/bash
     env:
 
     - name: TOTAL_CHAOS_DURATION
-      value: '30'
+      value: '30' 
 
     - name: CHAOS_INTERVAL
       value: '30'
 
+    - name: LIB
+      value: 'litmus'
+
     # Period to wait before and after injection of chaos in sec
     - name: RAMP_TIME
       value: ''
-
-    # provide the target instance name(s) (comma separated if multiple)
-    - name: AZURE_INSTANCE_NAME
-      value: ''
-
+    
     # provide the resource group of the instance
     - name: RESOURCE_GROUP
       value: ''
 
     # accepts enable/disable, default is disable
     - name: SCALE_SET
       value: ''
-
-    # Provide the path of aks credentials mounted from secret  
+    
+    # provide the virtual disk names (comma separated if multiple)
+    - name: VIRTUAL_DISK_NAMES
+      value: ''
+    
+    # provide the sequence type for the run. Options: serial/parallel
+    - name: SEQUENCE
+      value: 'parallel'
+    
+    # provide the path to aks credentials mounted from secret
     - name: AZURE_AUTH_LOCATION
       value: '/tmp/azure.auth'
 
-    - name: SEQUENCE
-      value: 'parallel'       
-
-    # provide the LIB
-    # only litmus supported
-    - name: LIB
-      value: 'litmus'  
-          
     labels:
-      name: azure-instance-stop
+      name: azure-disk-loss
       app.kubernetes.io/part-of: litmus
       app.kubernetes.io/component: experiment-job
       app.kubernetes.io/version: latest
+    
     secrets:
     - name: cloud-secret
       mountPath: /tmp/
 
-
 ---