From d2245ffbe6b240f84f8a35dc6be2a2b9a593042d Mon Sep 17 00:00:00 2001 From: Arpad Ryszka Date: Thu, 17 Jun 2021 18:32:31 +0200 Subject: [PATCH 1/4] use custom names for custom subnets Signed-off-by: Arpad Ryszka --- sevenseconds/config/vpc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sevenseconds/config/vpc.py b/sevenseconds/config/vpc.py index 4b527ed..24ea26b 100644 --- a/sevenseconds/config/vpc.py +++ b/sevenseconds/config/vpc.py @@ -255,6 +255,8 @@ def delete_rds_subnet_group(session: object, region: str): def configure_subnet(vpc, subnet: Subnet, dry_run: bool, waiter): name = '{}-{}'.format(subnet.subnet_type, subnet.availability_zone) tags = dict(subnet.tags) + custom_name = tags.get('zalando.org/custom-subnet') + name = custom_name and '{}-{}-{}'.format(custom_name, subnet.subnet_type, subnet.availability_zone) or name tags['Name'] = name existing_subnet = find_subnet(vpc, subnet.cidr) if not existing_subnet: @@ -268,7 +270,8 @@ def configure_subnet(vpc, subnet: Subnet, dry_run: bool, waiter): {'Name': 'availabilityZone', 'Values': [subnet.availability_zone]} ]) - existing_subnet.create_tags(Tags=[{'Key': k, 'Value': v} for k, v in tags.items()]) + if not dry_run: + existing_subnet.create_tags(Tags=[{'Key': k, 'Value': v} for k, v in tags.items()]) def find_subnet(vpc: object, cidr): From 85dcb0bb7f9198a1b59f323dc9eaad4bf55068e0 Mon Sep 17 00:00:00 2001 From: Arpad Ryszka Date: Tue, 22 Jun 2021 17:43:29 +0200 Subject: [PATCH 2/4] flip naming pattern to pick up by the routing table creation script Signed-off-by: Arpad Ryszka --- sevenseconds/config/vpc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sevenseconds/config/vpc.py b/sevenseconds/config/vpc.py index 24ea26b..1235c2e 100644 --- a/sevenseconds/config/vpc.py +++ b/sevenseconds/config/vpc.py @@ -256,7 +256,7 @@ def configure_subnet(vpc, subnet: Subnet, dry_run: bool, waiter): name = '{}-{}'.format(subnet.subnet_type, subnet.availability_zone) tags = dict(subnet.tags) custom_name = tags.get('zalando.org/custom-subnet') - name = custom_name and '{}-{}-{}'.format(custom_name, subnet.subnet_type, subnet.availability_zone) or name + name = custom_name and '{}-{}-{}'.format(subnet.subnet_type, custom_name, subnet.availability_zone) or name tags['Name'] = name existing_subnet = find_subnet(vpc, subnet.cidr) if not existing_subnet: From 6d5ed20e8eb35e672083b4fc56f6e76cbeddd592 Mon Sep 17 00:00:00 2001 From: Arpad Ryszka Date: Thu, 1 Jul 2021 10:40:20 +0200 Subject: [PATCH 3/4] only recreate the vpc if it is really not the default Signed-off-by: Arpad Ryszka --- sevenseconds/config/vpc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sevenseconds/config/vpc.py b/sevenseconds/config/vpc.py index 1235c2e..2dc5d19 100644 --- a/sevenseconds/config/vpc.py +++ b/sevenseconds/config/vpc.py @@ -28,7 +28,8 @@ def configure_vpc(account: AccountData, region, base_ami_id): info('Region with non default VPC-Network: {}'.format(vpc_net)) with ActionOnExit('Finding existing default VPC..'): vpc = find_vpc(ec2, VPC_NET) - if vpc: + # we only need to delete it if we use different settings for the VPC: + if vpc and vpc_net != VPC_NET: with ActionOnExit('Deleting old default VPC..') as act: delete_vpc(vpc, region) delete_vpc_addresses(account.session, region) From e4c01755b08eb0b83ce4da8d58a7f20efd1d6061 Mon Sep 17 00:00:00 2001 From: Arpad Ryszka Date: Wed, 7 Jul 2021 17:11:59 +0200 Subject: [PATCH 4/4] define new minimum version Signed-off-by: Arpad Ryszka --- sevenseconds/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sevenseconds/cli.py b/sevenseconds/cli.py index 013ff4b..1efb2bc 100644 --- a/sevenseconds/cli.py +++ b/sevenseconds/cli.py @@ -14,7 +14,7 @@ from .config.configure import start_configuration, start_cleanup CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) -SUPPORTED_CONFIG_VERSION = 9 +SUPPORTED_CONFIG_VERSION = 10 def print_version(ctx, param, value):