From 158b42908a2b1b38b6e7312c281dfae60db2617e Mon Sep 17 00:00:00 2001 From: Paige Patton Date: Tue, 8 Oct 2024 13:58:16 -0400 Subject: [PATCH] taking out post action env Signed-off-by: Paige Patton --- application-outages/env.sh | 1 - config.yaml.template | 1 - container-scenarios/env.sh | 3 +-- network-chaos/env.sh | 1 - node-scenarios/env.sh | 1 - pod-network-chaos/env.sh | 1 - pod-scenarios/env.sh | 1 - power-outages/env.sh | 3 +-- service-disruption-scenarios/env.sh | 3 +-- service-hijacking/env.sh | 1 - syn-flood/env.sh | 3 --- time-scenarios/env.sh | 1 - zone-outages/env.sh | 1 - 13 files changed, 3 insertions(+), 18 deletions(-) diff --git a/application-outages/env.sh b/application-outages/env.sh index 8a5121f..92e226b 100755 --- a/application-outages/env.sh +++ b/application-outages/env.sh @@ -5,6 +5,5 @@ export DURATION=${DURATION:=600} export NAMESPACE=${NAMESPACE:=} export POD_SELECTOR=${POD_SELECTOR:="{}"} export BLOCK_TRAFFIC_TYPE=${BLOCK_TRAFFIC_TYPE:=- Ingress} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} export SCENARIO_TYPE=${SCENARIO_TYPE:=application_outages_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/app_outage.yaml} diff --git a/config.yaml.template b/config.yaml.template index 8b50da5..7e795fb 100644 --- a/config.yaml.template +++ b/config.yaml.template @@ -9,7 +9,6 @@ kraken: chaos_scenarios: # List of policies/chaos scenarios to load - $SCENARIO_TYPE: # List of chaos time scenarios to load - $SCENARIO_FILE - $SCENARIO_POST_ACTION cerberus: cerberus_enabled: $CERBERUS_ENABLED # Enable it when cerberus is previously installed cerberus_url: $CERBERUS_URL # When cerberus_enabled is set to True, provide the url where cerberus publishes go/no-go signal diff --git a/container-scenarios/env.sh b/container-scenarios/env.sh index 61b74c2..3984d9f 100755 --- a/container-scenarios/env.sh +++ b/container-scenarios/env.sh @@ -8,5 +8,4 @@ export DISRUPTION_COUNT=${DISRUPTION_COUNT:=1} export CONTAINER_NAME=${CONTAINER_NAME:=etcd} export ACTION=${ACTION:=1} export SCENARIO_TYPE=${SCENARIO_TYPE:=container_scenarios} -export SCENARIO_FILE=${SCENARIO_FILE:=- scenarios/container_scenario.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} +export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/container_scenario.yaml} diff --git a/network-chaos/env.sh b/network-chaos/env.sh index 75e0f17..99e99b8 100755 --- a/network-chaos/env.sh +++ b/network-chaos/env.sh @@ -8,7 +8,6 @@ export INSTANCE_COUNT=${INSTANCE_COUNT:=1} export INTERFACES=${INTERFACES:="[]"} export EXECUTION=${EXECUTION:="parallel"} export EGRESS=${EGRESS:="{bandwidth: 100mbit}"} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} export SCENARIO_TYPE=${SCENARIO_TYPE:=network_chaos_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/network_chaos.yaml} export TRAFFIC_TYPE=${TRAFFIC_TYPE:=egress} diff --git a/node-scenarios/env.sh b/node-scenarios/env.sh index 6102681..89925b8 100755 --- a/node-scenarios/env.sh +++ b/node-scenarios/env.sh @@ -11,7 +11,6 @@ export TIMEOUT=${TIMEOUT:=180} export DURATION=${DURATION:=120} export SCENARIO_TYPE=${SCENARIO_TYPE:=node_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/node_scenario.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} export VERIFY_SESSION=${VERIFY_SESSION:="false"} export SKIP_OPENSHIFT_CHECKS=${SKIP_OPENSHIFT_CHECKS:="false"} diff --git a/pod-network-chaos/env.sh b/pod-network-chaos/env.sh index 466c9e1..d8a9641 100755 --- a/pod-network-chaos/env.sh +++ b/pod-network-chaos/env.sh @@ -12,4 +12,3 @@ export INSTANCE_COUNT=${INSTANCE_COUNT:=1} export TEST_DURATION=${TEST_DURATION:=120} export SCENARIO_TYPE=${SCENARIO_TYPE:=pod_network_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/pod_network_scenario.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} diff --git a/pod-scenarios/env.sh b/pod-scenarios/env.sh index dc27c32..6f8f949 100755 --- a/pod-scenarios/env.sh +++ b/pod-scenarios/env.sh @@ -9,4 +9,3 @@ export KILL_TIMEOUT=${KILL_TIMEOUT:=180} export EXPECTED_RECOVERY_TIME=${EXPECTED_RECOVERY_TIME:=120} export SCENARIO_TYPE=${SCENARIO_TYPE:=pod_disruption_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/pod_scenario.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} diff --git a/power-outages/env.sh b/power-outages/env.sh index 07113b1..2c3789d 100755 --- a/power-outages/env.sh +++ b/power-outages/env.sh @@ -5,5 +5,4 @@ export SHUTDOWN_DURATION=${SHUTDOWN_DURATION:=1200} export CLOUD_TYPE=${CLOUD_TYPE:="aws"} export TIMEOUT=${TIMEOUT:=180} export SCENARIO_TYPE=${SCENARIO_TYPE:=cluster_shut_down_scenarios} -export SCENARIO_FILE=${SCENARIO_FILE:=- scenarios/cluster_shut_down_scenario.yml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} +export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/cluster_shut_down_scenario.yml} diff --git a/service-disruption-scenarios/env.sh b/service-disruption-scenarios/env.sh index 62f5dd4..21f1e94 100755 --- a/service-disruption-scenarios/env.sh +++ b/service-disruption-scenarios/env.sh @@ -7,5 +7,4 @@ export RUNS=${RUNS:=1} export DELETE_COUNT=${DELETE_COUNT:=1} export SLEEP=${SLEEP:=15} export SCENARIO_TYPE=${SCENARIO_TYPE:=service_disruption_scenarios} -export SCENARIO_FILE=${SCENARIO_FILE:=- scenarios/namespace_scenario.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} +export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/namespace_scenario.yaml} diff --git a/service-hijacking/env.sh b/service-hijacking/env.sh index 0ae5a9d..b933968 100755 --- a/service-hijacking/env.sh +++ b/service-hijacking/env.sh @@ -4,4 +4,3 @@ export SCENARIO_BASE64=${SCENARIO_BASE64:=1} export SCENARIO_TYPE="service_hijacking_scenarios" export SCENARIO_FILE="scenarios/service_hijacking.yaml" -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} diff --git a/syn-flood/env.sh b/syn-flood/env.sh index 021c46e..0b422ce 100644 --- a/syn-flood/env.sh +++ b/syn-flood/env.sh @@ -11,8 +11,5 @@ export NUMBER_OF_PODS=${NUMBER_OF_PODS:="2"} export IMAGE=${IMAGE:="quay.io/krkn-chaos/krkn-syn-flood"} export NODE_SELECTORS=${NODE_SELECTORS:=""} -python3.9 $ROOT_FOLDER/build_config_file.py --outconfig $SCENARIO_CONFIG_FILE -cat $SCENARIO_CONFIG_FILE - export SCENARIO_TYPE=${SCENARIO_TYPE:=syn_flood_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=$SCENARIO_CONFIG_FILE} \ No newline at end of file diff --git a/time-scenarios/env.sh b/time-scenarios/env.sh index f62fb61..02045df 100755 --- a/time-scenarios/env.sh +++ b/time-scenarios/env.sh @@ -9,4 +9,3 @@ export NAMESPACE=${NAMESPACE:=""} export CONTAINER_NAME=${CONTAINER_NAME:=""} export SCENARIO_TYPE=${SCENARIO_TYPE:=time_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/time_scenario.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} diff --git a/zone-outages/env.sh b/zone-outages/env.sh index 3af8709..67ef1ca 100755 --- a/zone-outages/env.sh +++ b/zone-outages/env.sh @@ -8,4 +8,3 @@ export VPC_ID=${VPC_ID:=""} export SUBNET_ID=${SUBNET_ID:=""} export SCENARIO_TYPE=${SCENARIO_TYPE:=zone_outages_scenarios} export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/zone_outage.yaml} -export SCENARIO_POST_ACTION=${SCENARIO_POST_ACTION:=""} \ No newline at end of file