Merge pull request #1334 from ksatchit/v1.2.1

[Cherry-pick for 1.2.1]
litmuschaos · Mar 16, 2020 · 0a96ea3 · 0a96ea3
2 parents 0b909c8 + 291d5e2
commit 0a96ea3
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 29 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: true
diff --git a/ADOPTERS.md b/ADOPTERS.md
@@ -11,3 +11,5 @@ Please send PRs to add or remove organizations/users.
 | User | Applications/Workloads | Success Story |
 | :--- | :--- | :--- |
 | [Laura Henning](https://github.com/LaumiH) | reasearch on how to do chaos engineering in minikube demo clusters like [these](https://github.com/LaumiH/k8sstuff) | [my story](https://github.com/litmuschaos/litmus/tree/master/adopters/Laura_Henning_Research_Project.md) |
+| [Johnny Jacob](https://github.com/johnnyjacob) | Testing deployment designs for resiliency | Coming Soon! |
+| [Jayesh Kumar Tank](https://github.com/k8s-dev) | Create Cloud Native Validation Suite on [Demo Application](https://github.com/k8s-dev/microservices-demo)| [my story](https://github.com/litmuschaos/litmus/tree/master/adopters/Jayesh_Kumar_CloudNative_Validation.md)
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
@@ -31,28 +31,18 @@
     -   Pre Release Version (Development)
          <table>
           <tr>
-            <td>0.8.0-RC-1</td>
-            <td><a href="https://docs.litmuschaos.io/docs/getstarted">Documentation</a></td>
-            <td><a href="https://github.com/litmuschaos/litmus/releases/tag/0.8.0-RC1">Release Notes</a></td>
+            <td>1.2.1</td>
+            <td>TBD</td>
+            <td>TBD</td>
           </tr>
         </table>
 
     -   Current version (Stable)
         <table>
           <tr>
-            <td>0.7.0</td>
+            <td>1.2.0</td>
             <td><a href="https://docs.litmuschaos.io/docs/getstarted">Documentation</a></td>
-            <td><a href="https://github.com/litmuschaos/litmus/releases/tag/0.7.0">Release Notes</a></td>
-          </tr>
-        </table>
-
-    -   Past Versions
-        Here you can find previous versions of the documentation.
-        <table>
-          <tr>
-            <td>0.6.0</td>
-            <td><a href="https://docs.litmuschaos.io/docs/0.6.0/overview">Documentation</a></td>
-            <td><a href="https://github.com/litmuschaos/litmus/releases/tag/0.6.0">Release Notes</a></td>
+            <td><a href="https://github.com/litmuschaos/litmus/releases/tag/1.2.0">Release Notes</a></td>
           </tr>
         </table>
 

diff --git a/adopters/Jayesh_Kumar_CloudNative_Validation.md b/adopters/Jayesh_Kumar_CloudNative_Validation.md
@@ -0,0 +1,5 @@
+I started exploring the facinating world of Chaos Engineering while working on stitching together CloudNative Validation Suite. In persuit of finding the suitable candidate, I evaluated
+couple of Chaos Engineering tool chains, both free as well commercial and finally settled on to LitmusChaos. I have my own  reasons to do so, which includes super helpful developers and community supporting this project.
+While evaluating LitmusChaos for my pipeline - I requested a new feature for Aborting the active experiment,  which was accepted and is being actively worked on.
+Another thing which sets LitmusChaos apart from many other players is it being fully CloudNative, ease of development in Ansible. ChaosHub is a central place for community to contribute their work and make it available for others.
+In the past I have been contributing to Litmus-Docs project as maintainer and looking forward to contribute a couple of Chaos Experiments. Keeping my fingers crossed!!
diff --git a/experiments/generic/disk_loss/chaosutil.j2 b/experiments/generic/disk_loss/chaosutil.j2
@@ -1,6 +1,6 @@
 # All code here is not indented because j2 is space sensitive
 # checks if cloud_platform is set or not
-{% if cloud_platform is defined and cloud_platform == 'GCP' %}
+{% if cloud_platform is defined and cloud_platform == 'GKE' %}
 c_util: /chaoslib/litmus/platform/gke/disk_loss.yml
 {% elif cloud_platform is defined and cloud_platform == 'AWS' %}
 c_util: /chaoslib/litmus/platform/aws/disk_loss.yml

diff --git a/experiments/generic/disk_loss/disk_loss_k8s_job.yml b/experiments/generic/disk_loss/disk_loss_k8s_job.yml
@@ -38,9 +38,9 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
 
-          # Only GCP is supported
+          # GKE and AWS supported
           - name: CLOUD_PLATFORM
-            value: ''
+            value: 'GKE'
 
           # Enter the time duration after the disk is dettached
           - name: TOTAL_CHAOS_DURATION

diff --git a/experiments/generic/node_cpu_hog/chaosutil.j2 b/experiments/generic/node_cpu_hog/chaosutil.j2
@@ -1,3 +1,3 @@
-{% if a_platform is defined and a_platform  == 'GKE' %}
+{% if a_platform is defined and a_platform  == 'GKE' or a_platform  == 'EKS' %}
 c_util: /chaoslib/litmus/platform/gke/node_cpu_consumption.yml
 {% endif %}
diff --git a/experiments/generic/node_cpu_hog/node_cpu_hog_k8s_job.yml b/experiments/generic/node_cpu_hog/node_cpu_hog_k8s_job.yml
@@ -32,7 +32,8 @@ spec:
           - name: APP_KIND
             value: ''
 
-          ## PLATFORM SUPPORTED 
+          ## It supports GKE and EKS platform
+          ## GKE is the default Platform
           - name: PLATFORM
             value: 'GKE'
 

diff --git a/experiments/generic/node_memory_hog/chaosutil.j2 b/experiments/generic/node_memory_hog/chaosutil.j2
@@ -1,3 +1,3 @@
-{% if a_platform is defined and a_platform  == 'GKE' %}
+{% if a_platform is defined and a_platform  == 'GKE' or a_platform  == 'EKS' %}
 c_util: /chaoslib/litmus/platform/gke/node_memory_consumption.yml
 {% endif %}
diff --git a/experiments/generic/node_memory_hog/node_memory_hog_k8s_job.yml b/experiments/generic/node_memory_hog/node_memory_hog_k8s_job.yml
@@ -32,7 +32,8 @@ spec:
           - name: APP_KIND
             value: ''
 
-          ## PLATFORM SUPPORTED 
+          ## It supports GKE and EKS platform
+          ## GKE is the default Platform
           - name: PLATFORM
             value: 'GKE'
 

diff --git a/experiments/kafka/kafka-broker-disk-failure/chaosutil.j2 b/experiments/kafka/kafka-broker-disk-failure/chaosutil.j2
@@ -1,5 +1,5 @@
 # checks if cloud_platform is set or not
-{% if cloud_platform is defined and cloud_platform == 'GCP' %}
+{% if cloud_platform is defined and cloud_platform == 'GKE' %}
   c_util: /chaoslib/litmus/platform/gke/disk_loss.yml
 {% elif cloud_platform is defined and cloud_platform == 'AWS' %}
   c_util: /chaoslib/litmus/platform/aws/disk_loss.yml

diff --git a/experiments/kafka/kafka-broker-disk-failure/kafka-broker-disk-failure-ansible-logic.yml b/experiments/kafka/kafka-broker-disk-failure/kafka-broker-disk-failure-ansible-logic.yml
@@ -27,6 +27,7 @@
     c_engine: "{{ lookup('env','CHAOSENGINE') }}"
     chaos_pod_name: "{{ lookup('env','POD_NAME') }}"
     chaos_uid: "{{ lookup('env','CHAOS_UID') }}"
+    a_ns: "{{ lookup('env','KAFKA_NAMESPACE') }}"
 
   tasks:
     - block:

diff --git a/experiments/kafka/kafka-broker-disk-failure/kafka-broker-disk-failure-k8s-job.yml b/experiments/kafka/kafka-broker-disk-failure/kafka-broker-disk-failure-k8s-job.yml
@@ -38,8 +38,9 @@ spec:
           - name: TOTAL_CHAOS_DURATION
             value: '30'
 
+          # GKE and AWS supported
           - name: CLOUD_PLATFORM
-            value: 'GCP'
+            value: 'GKE'
 
           - name: PROJECT_ID
             value: ''

diff --git a/...riments/kafka/kafka-broker-network-latency/kafka-broker-network-latency-ansible-logic.yml b/...riments/kafka/kafka-broker-network-latency/kafka-broker-network-latency-ansible-logic.yml
@@ -28,6 +28,7 @@
     chaos_uid: "{{ lookup('env','CHAOS_UID') }}" 
     c_engine: "{{ lookup('env','CHAOSENGINE') }}"
     chaos_pod_name: "{{ lookup('env','POD_NAME') }}"
+    a_ns: "{{ lookup('env','KAFKA_NAMESPACE') }}"
 
   tasks:
     - block:

diff --git a/experiments/kafka/kafka-broker-network-loss/kafka-broker-network-loss-ansible-logic.yml b/experiments/kafka/kafka-broker-network-loss/kafka-broker-network-loss-ansible-logic.yml
@@ -28,6 +28,7 @@
     chaos_uid: "{{ lookup('env','CHAOS_UID') }}"
     c_engine: "{{ lookup('env','CHAOSENGINE') }}"
     chaos_pod_name: "{{ lookup('env','POD_NAME') }}"
+    a_ns: "{{ lookup('env','KAFKA_NAMESPACE') }}"
 
   tasks:
     - block:

diff --git a/experiments/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure-ansible-logic.yml b/experiments/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure-ansible-logic.yml
@@ -29,6 +29,7 @@
     chaos_uid: "{{ lookup('env','CHAOS_UID') }}" 
     c_engine: "{{ lookup('env','CHAOSENGINE') }}"
     chaos_pod_name: "{{ lookup('env','POD_NAME') }}"
+    a_ns: "{{ lookup('env','KAFKA_NAMESPACE') }}"
 
   tasks:
     - block:

diff --git a/experiments/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure-k8s-job.yml b/experiments/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure-k8s-job.yml
@@ -34,9 +34,9 @@ spec:
           - name: KAFKA_SASL_AUTH
             value: 'disabled'
 
-          # in milliseconds
+          # Recommended timeout for EKS platform: 60000 ms
           - name: KAFKA_CONSUMER_TIMEOUT
-            value: '30000'
+            value: '30000'  # in milliseconds
 
           - name: TOTAL_CHAOS_DURATION
             value: '15'

diff --git a/experiments/openebs/openebs-pool-disk-loss/chaosutil.j2 b/experiments/openebs/openebs-pool-disk-loss/chaosutil.j2
@@ -1,7 +1,7 @@
 # All code here is not indented because j2 
 {% if stg_prov is defined and stg_prov == 'openebs.io/provisioner-iscsi' %}
 {% if stg_engine is defined and stg_engine == 'cstor' or stg_engine == 'jiva' %}
-{% if cloud_platform is defined and cloud_platform == 'GCP' %}
+{% if cloud_platform is defined and cloud_platform == 'GKE' %}
 c_util: /chaoslib/litmus/platform/gke/disk_loss.yml
 {% elif cloud_platform is defined and cloud_platform == 'AWS' %}
 c_util: /chaoslib/litmus/platform/aws/disk_loss.yml

diff --git a/experiments/openebs/openebs-pool-disk-loss/openebs_pool_disk_loss_k8s_job.yml b/experiments/openebs/openebs-pool-disk-loss/openebs_pool_disk_loss_k8s_job.yml
@@ -35,9 +35,9 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
 
-          # Only GCP and AWS is supported
+          # GKE and AWS supported
           - name: CLOUD_PLATFORM
-            value: 'GCP'
+            value: 'GKE'
 
           # Enter the time duration in sec after the disk is dettached
           - name: TOTAL_CHAOS_DURATION

diff --git a/utils/common/generate-kubernetes-chaos-events.yml b/utils/common/generate-kubernetes-chaos-events.yml
@@ -24,6 +24,7 @@
     type: Normal
     count: 1
     firstTimestamp: "{{ ts }}"
+    lastTimestamp: "{{ ts }}"
     involvedObject:
      apiVersion: litmuschaos.io/v1alpha1
      kind: ChaosEngine