⚰️ Drop unused identity support subnet

alan-turing-institute · Apr 15, 2024 · 81146f7 · 81146f7
1 parent 73f26ae
commit 81146f7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 34 deletions.
diff --git a/data_safe_haven/infrastructure/common/ip_ranges.py b/data_safe_haven/infrastructure/common/ip_ranges.py
@@ -17,7 +17,6 @@ def __init__(self, index: int) -> None:
         self.guacamole_containers = self.vnet.next_subnet(8)
         self.guacamole_containers_support = self.vnet.next_subnet(8)
         self.identity_containers = self.vnet.next_subnet(8)
-        self.identity_containers_support = self.vnet.next_subnet(8)
         self.user_services_containers = self.vnet.next_subnet(8)
         self.user_services_containers_support = self.vnet.next_subnet(8)
         self.user_services_databases = self.vnet.next_subnet(8)

diff --git a/data_safe_haven/infrastructure/stacks/sre/networking.py b/data_safe_haven/infrastructure/stacks/sre/networking.py
@@ -55,9 +55,6 @@ def __init__(
         self.subnet_identity_containers_iprange = subnet_ranges.apply(
             lambda s: s.identity_containers
         )
-        self.subnet_identity_containers_support_iprange = subnet_ranges.apply(
-            lambda s: s.identity_containers_support
-        )
         self.subnet_user_services_containers_iprange = subnet_ranges.apply(
             lambda s: s.user_services_containers
         )
@@ -154,9 +151,6 @@ def __init__(
         subnet_identity_containers_prefix = (
             props.subnet_identity_containers_iprange.apply(lambda r: str(r))
         )
-        subnet_identity_containers_support_prefix = (
-            props.subnet_identity_containers_support_iprange.apply(lambda r: str(r))
-        )
         subnet_user_services_containers_prefix = (
             props.subnet_user_services_containers_iprange.apply(lambda r: str(r))
         )
@@ -666,17 +660,6 @@ def __init__(
             opts=child_opts,
             tags=child_tags,
         )
-        nsg_identity_containers_support = network.NetworkSecurityGroup(
-            f"{self._name}_nsg_identity_containers_support",
-            network_security_group_name=f"{stack_name}-nsg-identity-containers-support",
-            resource_group_name=resource_group.name,
-            security_rules=[
-                # Inbound
-                # Outbound
-            ],
-            opts=child_opts,
-            tags=child_tags,
-        )
         nsg_user_services_containers = network.NetworkSecurityGroup(
             f"{self._name}_nsg_user_services_containers",
             network_security_group_name=f"{stack_name}-nsg-user-services-containers",
@@ -1196,7 +1179,6 @@ def __init__(
         subnet_guacamole_containers_name = "GuacamoleContainersSubnet"
         subnet_guacamole_containers_support_name = "GuacamoleContainersSupportSubnet"
         subnet_identity_containers_name = "IdentityContainersSubnet"
-        subnet_identity_containers_support_name = "IdentityContainersSupportSubnet"
         subnet_user_services_containers_name = "UserServicesContainersSubnet"
         subnet_user_services_containers_support_name = (
             "UserServicesContainersSupportSubnet"
@@ -1296,16 +1278,6 @@ def __init__(
                     ),
                     route_table=network.RouteTableArgs(id=route_table.id),
                 ),
-                # Identity containers support
-                network.SubnetArgs(
-                    address_prefix=subnet_identity_containers_support_prefix,
-                    name=subnet_identity_containers_support_name,
-                    network_security_group=network.NetworkSecurityGroupArgs(
-                        id=nsg_identity_containers_support.id
-                    ),
-                    private_endpoint_network_policies=network.VirtualNetworkPrivateEndpointNetworkPolicies.ENABLED,
-                    route_table=network.RouteTableArgs(id=route_table.id),
-                ),
                 # User services containers
                 network.SubnetArgs(
                     address_prefix=subnet_user_services_containers_prefix,
@@ -1576,11 +1548,6 @@ def __init__(
             resource_group_name=resource_group.name,
             virtual_network_name=sre_virtual_network.name,
         )
-        self.subnet_identity_containers_support = network.get_subnet_output(
-            subnet_name=subnet_identity_containers_support_name,
-            resource_group_name=resource_group.name,
-            virtual_network_name=sre_virtual_network.name,
-        )
         self.subnet_data_private = network.get_subnet_output(
             subnet_name=subnet_data_private_name,
             resource_group_name=resource_group.name,