fix(charts): fixing the name of kube-aws charts (#301)

Signed-off-by: shubhamchaudhary <shubham.chaudhary@mayadata.io>

charts/generic/k8-service-kill/k8-service-kill.chartserviceversion.yaml

@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
+  name: k8-service-kill
   version: 0.0.4
   annotations:
     categories: Kubernetes
@@ -9,9 +9,9 @@ metadata:
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-service-kill
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    K8 service kill contains chaos to kill a micro service running on the k8 cluster. It uses chaostoolkit to inject micro service kill against specified applications
   keywords:
     - Kubernetes
     - State
@@ -30,4 +30,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-service-kill/experiment.yaml

charts/kube-aws/experiments.yaml

@@ -1,110 +0,0 @@
----
-
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Deletes an aws instance belonging to a deployment/statefulset/daemonset
-kind: ChaosExperiment
-metadata:
-  name: aws-ec2-terminate
-  version: 0.0.1
-spec:
-  definition:
-    scope: Namespaced
-    permissions:
-      - apiGroups:
-          - ""
-          - "apps"
-          - "batch"
-          - "litmuschaos.io"
-        resources:
-          - "deployments"
-          - "jobs"
-          - "pods"
-          - "configmaps"
-          - "chaosengines"
-          - "chaosexperiments"
-          - "chaosresults"
-        verbs:
-          - "create"
-          - "list"
-          - "get"
-          - "patch"
-          - "update"
-          - "delete"
-      - apiGroups:
-          - ""
-        resources:
-          - "nodes"
-        verbs :
-          - "get"
-          - "list"
-    image: "litmuschaos/chaostoolkit:latest"
-    args:
-    - -c
-    - python /app/chaos/chaostest/aws/aws_wrapper.py ; exit 0
-    command:
-    - /bin/bash
-    env:
-
-    - name: CHAOSTOOLKIT_IN_POD
-      value: 'true'
-
-    - name: FILE
-      value: 'ec2-delete.json'
-
-    - name: NAME_SPACE
-      value: 'default'
-
-    - name: LABEL_NAME
-      value: 'app=nginx'
-
-    - name: APP_ENDPOINT
-      value: 'localhost'
-
-    # Period to wait before injection of chaos in sec
-    - name: PERCENTAGE
-      value: '50'
-
-    # Variable to set for custom report upload
-    - name: REPORT
-      value: 'false'
-
-    # Variable to set for report upload endpoint
-    - name: REPORT_ENDPOINT
-      value: 'none'
-
-    # Variable to set for AWS account
-    - name: AWS_ACCOUNT
-      value: '000000000000'
-
-    # Variable to set for AWS role, Make sure you have created this role and have give access
-    - name: AWS_ROLE
-      value: 'chaosec2access'
-
-    # Variable to set for AWS region
-    - name: AWS_REGION
-      value: 'us-west-2'
-
-    # Variable to set for AWS AZ
-    - name: AWS_AZ
-      value: 'us-west-2c'
-
-    # Variable to set for AWS RESOURCE
-    - name: AWS_RESOURCE
-      value: 'ec2-iks'
-
-    # Variable to set for AWS SSL
-    - name: AWS_SSL
-      value: 'false'
-
-    # Variable which indicates where the test results CRs will be persisted
-    - name: TEST_NAMESPACE
-      value: 'default'
-
-    labels:
-      name: aws-ec2-terminate
-
-
----
-

charts/kube-aws/k8-aws-ec2-terminate/engine.yaml

@@ -1,7 +1,7 @@
 apiVersion: litmuschaos.io/v1alpha1
 kind: ChaosEngine
 metadata:
-  name: aws-ec2-terminate
+  name: k8-aws-ec2-terminate
   namespace: default
 spec:
   appinfo:
@@ -18,7 +18,7 @@ spec:
       runnerannotation:
         iam.amazonaws.com/role: "k8s-chaosec2access"
   experiments:
-    - name: aws-ec2-terminate
+    - name: k8-aws-ec2-terminate
       spec:
         components:
           experimentannotation:

charts/kube-aws/k8-aws-ec2-terminate/experiment.yaml

@@ -4,7 +4,7 @@ description:
     Deletes an aws instance belonging to a deployment/statefulset/daemonset
 kind: ChaosExperiment
 metadata:
-  name: aws-ec2-terminate
+  name: k8-aws-ec2-terminate
   version: 0.0.1
 spec:
   definition:
@@ -101,5 +101,5 @@ spec:
       value: 'default'
 
     labels:
-      name: aws-ec2-terminate
+      name: k8-aws-ec2-terminate
 

scripts/combine_all_cr.sh

@@ -1,18 +1,15 @@
 directories=$(find ./charts -maxdepth 1 -mindepth 1 -type d)
 for directory in $directories
 do
-	subDirectories=$(find $directory -maxdepth 1 -mindepth 1 -type d)
+    subDirectories=$(find $directory -maxdepth 1 -mindepth 1 -type d)
 	echo -e "---\n" > $directory/experiments.yaml
 	for subDirectory in $subDirectories
 	do
-
+	    if test -f "$subDirectory/experiment.yaml"; then
-               if test -f "$subDirectory/experiment.yaml"; then
+	      cat $subDirectory/experiment.yaml >> $directory/experiments.yaml
-	          cat $subDirectory/experiment.yaml >> $directory/experiments.yaml
+	      echo -e "\n---\n" >> $directory/experiments.yaml                  		  
-	          echo -e "\n---\n" >> $directory/experiments.yaml                  		  
+	    fi
-	       fi
+    done
-        done
+	echo "validating combine charts for "$directory
+	cat $directory/experiments.yaml	
 done
-echo "validating combine charts for generic"
-cat ./charts/generic/experiments.yaml
-echo "validating combine charts for openebs"
-cat ./charts/openebs/experiments.yaml