Merge branch 'krkn-chaos:main' into main

redhat-chaos · Jan 6, 2025 · 0106d6d · 0106d6d
2 parents fb0f85b + 9b931c8
commit 0106d6d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/docs/zone-outages.md b/docs/zone-outages.md
@@ -36,8 +36,8 @@ Parameter               | Description
 CLOUD_TYPE              | Cloud platform on top of which cluster is running, [supported cloud platforms](https://github.com/krkn-chaos/krkn/blob/master/docs/node_scenarios.md)                     | aws |
 DURATION                | Duration in seconds after which the zone will be back online          | 600                                  |
 VPC_ID                  | cluster virtual private network to target ( REQUIRED )                             | ""                                   |
-SUBNET_ID               | subnet-id to deny both ingress and egress traffic ( REQUIRED ). Format: [subenet1, subnet2]                    | ""                                   |
-
+SUBNET_ID               | subnet-id to deny both ingress and egress traffic ( REQUIRED ). Format: [subenet1, subnet2]                    | ""       |
+DEFAULT_ACL_ID          | (Optional) ID of an existing network ACL to use instead of creating a new one. If provided, this ACL will not be deleted after the scenario | "" |
 
 The following environment variables need to be set for the scenarios that requires intereacting with the cloud platform API to perform the actions:
 

diff --git a/zone-outages/env.sh b/zone-outages/env.sh
@@ -6,5 +6,6 @@ export CLOUD_TYPE=${CLOUD_TYPE:="aws"}
 export DURATION=${DURATION:=600}
 export VPC_ID=${VPC_ID:=""}
 export SUBNET_ID=${SUBNET_ID:=""}
+export DEFAULT_ACL_ID=${DEFAULT_ACL_ID:=""}
 export SCENARIO_TYPE=${SCENARIO_TYPE:=zone_outages_scenarios}
 export SCENARIO_FILE=${SCENARIO_FILE:=scenarios/zone_outage.yaml}
diff --git a/zone-outages/zone_outage_scenario.yaml.template b/zone-outages/zone_outage_scenario.yaml.template
@@ -3,3 +3,4 @@ zone_outage:                                         # Scenario to create an out
   duration: $DURATION                                # duration in seconds after which the zone will be back online
   vpc_id: $VPC_ID                                    # cluster virtual private network to target
   subnet_id: $SUBNET_ID                              # subnet-id to deny both ingress and egress traffic
+  default_acl_id: $DEFAULT_ACL_ID                     # (Optional) ID of an existing network ACL to use instead of creating a new one. If provided, this ACL                                                        will not be deleted after the scenario.