From 16e912c0540be8c5d88df8f2c3e16fd9ea32e853 Mon Sep 17 00:00:00 2001 From: Shubham Chaudhary Date: Sat, 22 Aug 2020 17:53:02 +0530 Subject: [PATCH] fix(charts): fixing the name of kube-aws charts (#301) Signed-off-by: shubhamchaudhary --- .../k8-service-kill.chartserviceversion.yaml | 8 +- charts/kube-aws/experiments.yaml | 110 ------------------ .../kube-aws/k8-aws-ec2-terminate/engine.yaml | 4 +- .../k8-aws-ec2-terminate/experiment.yaml | 4 +- scripts/combine_all_cr.sh | 23 ++-- 5 files changed, 18 insertions(+), 131 deletions(-) delete mode 100644 charts/kube-aws/experiments.yaml diff --git a/charts/generic/k8-service-kill/k8-service-kill.chartserviceversion.yaml b/charts/generic/k8-service-kill/k8-service-kill.chartserviceversion.yaml index 8bbeb20..ef91ec4 100644 --- a/charts/generic/k8-service-kill/k8-service-kill.chartserviceversion.yaml +++ b/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 diff --git a/charts/kube-aws/experiments.yaml b/charts/kube-aws/experiments.yaml deleted file mode 100644 index d796a7a..0000000 --- a/charts/kube-aws/experiments.yaml +++ /dev/null @@ -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 - - ---- - diff --git a/charts/kube-aws/k8-aws-ec2-terminate/engine.yaml b/charts/kube-aws/k8-aws-ec2-terminate/engine.yaml index fb460f6..16df27d 100644 --- a/charts/kube-aws/k8-aws-ec2-terminate/engine.yaml +++ b/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: diff --git a/charts/kube-aws/k8-aws-ec2-terminate/experiment.yaml b/charts/kube-aws/k8-aws-ec2-terminate/experiment.yaml index 9863aa3..77b4b99 100644 --- a/charts/kube-aws/k8-aws-ec2-terminate/experiment.yaml +++ b/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 diff --git a/scripts/combine_all_cr.sh b/scripts/combine_all_cr.sh index 70b2989..9a73d24 100644 --- a/scripts/combine_all_cr.sh +++ b/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 - cat $subDirectory/experiment.yaml >> $directory/experiments.yaml - echo -e "\n---\n" >> $directory/experiments.yaml - fi - done -done -echo "validating combine charts for generic" -cat ./charts/generic/experiments.yaml -echo "validating combine charts for openebs" -cat ./charts/openebs/experiments.yaml + do + if test -f "$subDirectory/experiment.yaml"; then + cat $subDirectory/experiment.yaml >> $directory/experiments.yaml + echo -e "\n---\n" >> $directory/experiments.yaml + fi + done + echo "validating combine charts for "$directory + cat $directory/experiments.yaml +done \ No newline at end of file