qontract-reconcile 0.10.2.dev309__tar.gz → 0.10.2.dev311__tar.gz

{qontract_reconcile-0.10.2.dev309 → qontract_reconcile-0.10.2.dev311}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev309
+Version: 0.10.2.dev311
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev309 → qontract_reconcile-0.10.2.dev311}/reconcile/gql_definitions/common/aws_vpc_requests.py

@@ -58,10 +58,13 @@ fragment VPCRequest on VPCRequest_v1 {
   cidr_block {
     networkAddress
   }
+  vpc_tags
   subnets {
-    private 
+    private
     public
     availability_zones
+    private_subnet_tags
+    public_subnet_tags
   }
 }
 

{qontract_reconcile-0.10.2.dev309 → qontract_reconcile-0.10.2.dev311}/reconcile/gql_definitions/fragments/aws_vpc_request.py

@@ -54,6 +54,8 @@ class VPCRequestSubnetsListsV1(ConfiguredBaseModel):
     private: Optional[list[str]] = Field(..., alias="private")
     public: Optional[list[str]] = Field(..., alias="public")
     availability_zones: Optional[list[str]] = Field(..., alias="availability_zones")
+    private_subnet_tags: Optional[Json] = Field(..., alias="private_subnet_tags")
+    public_subnet_tags: Optional[Json] = Field(..., alias="public_subnet_tags")
 
 
 class VPCRequest(ConfiguredBaseModel):
@@ -62,4 +64,5 @@ class VPCRequest(ConfiguredBaseModel):
     account: AWSAccountV1 = Field(..., alias="account")
     region: str = Field(..., alias="region")
     cidr_block: NetworkV1 = Field(..., alias="cidr_block")
+    vpc_tags: Optional[Json] = Field(..., alias="vpc_tags")
     subnets: Optional[VPCRequestSubnetsListsV1] = Field(..., alias="subnets")

{qontract_reconcile-0.10.2.dev309 → qontract_reconcile-0.10.2.dev311}/reconcile/gql_definitions/introspection.json

@@ -10948,18 +10948,6 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
-                        {
-                            "name": "slack_username",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
                         {
                             "name": "pagerduty_username",
                             "description": null,
@@ -27860,6 +27848,18 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "vpc_tags",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -28089,6 +28089,30 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "private_subnet_tags",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "public_subnet_tags",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,

{qontract_reconcile-0.10.2.dev309 → qontract_reconcile-0.10.2.dev311}/reconcile/terraform_vpc_resources/integration.py

@@ -31,7 +31,11 @@ from reconcile.utils.runtime.integration import (
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.terraform_client import TerraformClient
-from reconcile.utils.terrascript_aws_client import TerrascriptClient
+from reconcile.utils.terrascript_aws_client import (
+    VPC_REQUEST_DEFAULT_PRIVATE_SUBNET_TAGS,
+    VPC_REQUEST_DEFAULT_PUBLIC_SUBNET_TAGS,
+    TerrascriptClient,
+)
 from reconcile.utils.vcs import VCS
 
 QONTRACT_INTEGRATION = "terraform_vpc_resources"
@@ -90,14 +94,28 @@ class TerraformVpcResources(QontractReconcileIntegration[TerraformVpcResourcesPa
                 f"{request.identifier}-public_subnets", {}
             ).get("value", [])
 
+            if request.subnets:
+                private_subnet_tags = VPC_REQUEST_DEFAULT_PRIVATE_SUBNET_TAGS | (
+                    request.subnets.private_subnet_tags or {}
+                )
+                public_subnet_tags = VPC_REQUEST_DEFAULT_PUBLIC_SUBNET_TAGS | (
+                    request.subnets.public_subnet_tags or {}
+                )
+            else:
+                private_subnet_tags = VPC_REQUEST_DEFAULT_PRIVATE_SUBNET_TAGS
+                public_subnet_tags = VPC_REQUEST_DEFAULT_PUBLIC_SUBNET_TAGS
+
             values = {
                 "static": {
                     "vpc_id": outputs_per_account.get(
                         f"{request.identifier}-vpc_id", {}
                     ).get("value"),
+                    "vpc_tags": request.vpc_tags or {},
                     "subnets": {
                         "private": private_subnets,
                         "public": public_subnets,
+                        "private_subnet_tags": private_subnet_tags,
+                        "public_subnet_tags": public_subnet_tags,
                     },
                     "account_name": request.account.name,
                     "region": request.region,

{qontract_reconcile-0.10.2.dev309 → qontract_reconcile-0.10.2.dev311}/reconcile/utils/terrascript_aws_client.py

@@ -321,6 +321,9 @@ AWS_US_GOV_ELB_ACCOUNT_IDS = {
     "us-gov-east-1": "190560391635",
 }
 
+VPC_REQUEST_DEFAULT_PRIVATE_SUBNET_TAGS = {"kubernetes.io/role/internal-elb": "1"}
+VPC_REQUEST_DEFAULT_PUBLIC_SUBNET_TAGS = {"kubernetes.io/role/elb": "1"}
+
 
 class OutputResourceNameNotUniqueError(Exception):
     def __init__(self, namespace: str | None, duplicates: Iterable[str]) -> None:
@@ -1327,25 +1330,32 @@ class TerrascriptClient:
                 "version": vpc_module_version,
                 "name": request.identifier,
                 "cidr": request.cidr_block.network_address,
-                "private_subnet_tags": {"kubernetes.io/role/internal-elb": "1"},
-                "public_subnet_tags": {"kubernetes.io/role/elb": "1"},
                 "create_database_subnet_group": False,
                 "enable_dns_hostnames": True,
+                "vpc_tags": request.vpc_tags or {},
                 "tags": {
                     "managed_by_integration": self.integration,
                 },
             }
 
-            if request.subnets and request.subnets.public:
-                vpc_module_values["public_subnets"] = request.subnets.public
-            if request.subnets and request.subnets.private:
-                vpc_module_values["private_subnets"] = request.subnets.private
-            if request.subnets and request.subnets.availability_zones:
-                vpc_module_values["azs"] = request.subnets.availability_zones
-
-            # We only want to enable nat_gateway if we have public and private subnets
-            if request.subnets and request.subnets.public and request.subnets.private:
-                vpc_module_values["enable_nat_gateway"] = True
+            if request.subnets:
+                if request.subnets.public:
+                    vpc_module_values["public_subnets"] = request.subnets.public
+                    vpc_module_values["public_subnet_tags"] = (
+                        VPC_REQUEST_DEFAULT_PUBLIC_SUBNET_TAGS
+                        | (request.subnets.public_subnet_tags or {})
+                    )
+                if request.subnets.private:
+                    vpc_module_values["private_subnets"] = request.subnets.private
+                    vpc_module_values["private_subnet_tags"] = (
+                        VPC_REQUEST_DEFAULT_PRIVATE_SUBNET_TAGS
+                        | (request.subnets.private_subnet_tags or {})
+                    )
+                if request.subnets.availability_zones:
+                    vpc_module_values["azs"] = request.subnets.availability_zones
+                # We only want to enable nat_gateway if we have public and private subnets
+                if request.subnets.public and request.subnets.private:
+                    vpc_module_values["enable_nat_gateway"] = True
 
             aws_account = request.account.name
             vpc_module = Module(request.identifier, **vpc_module_values)
@@ -1386,19 +1396,20 @@ class TerrascriptClient:
             )
             self.add_resource(aws_account, vpc_cidr_block_output)
 
-            if request.subnets and request.subnets.private:
-                private_subnets_output = Output(
-                    f"{request.identifier}-private_subnets",
-                    value=f"${{module.{request.identifier}.private_subnets}}",
-                )
-                self.add_resource(aws_account, private_subnets_output)
+            if request.subnets:
+                if request.subnets.private:
+                    private_subnets_output = Output(
+                        f"{request.identifier}-private_subnets",
+                        value=f"${{module.{request.identifier}.private_subnets}}",
+                    )
+                    self.add_resource(aws_account, private_subnets_output)
 
-            if request.subnets and request.subnets.public:
-                public_subnets_output = Output(
-                    f"{request.identifier}-public_subnets",
-                    value=f"${{module.{request.identifier}.public_subnets}}",
-                )
-                self.add_resource(aws_account, public_subnets_output)
+                if request.subnets.public:
+                    public_subnets_output = Output(
+                        f"{request.identifier}-public_subnets",
+                        value=f"${{module.{request.identifier}.public_subnets}}",
+                    )
+                    self.add_resource(aws_account, public_subnets_output)
 
     def populate_tgw_attachments(
         self, desired_state: Iterable[DesiredStateItem]