diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d35c6ac3..b67b5f69 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -177,7 +177,7 @@ jobs: ssh-keygen -t rsa -f dummy.pem -N '' export DEPLOY_ID="$NAME" - export MOD_VERSION="v3.0.8" + export MOD_VERSION="v3.0.10" envsubst < config.tpl | tee config.yaml ./convert.py check-requirements diff --git a/convert/lib/convert.py b/convert/lib/convert.py index 2859efcc..79fd4555 100755 --- a/convert/lib/convert.py +++ b/convert/lib/convert.py @@ -570,8 +570,11 @@ def get_subnet_ids(subnet_type: str, prefix: str = "VPC"): eks_cluster_auto_sg = eks_cluster_result["cluster"]["resourcesVpcConfig"]["clusterSecurityGroupId"] route53_hosted_zone_name = None + route53_hosted_zone_private = False if r53_zone_ids := self.cdkconfig["route53"]["zone_ids"]: - route53_hosted_zone_name = self.r53.get_hosted_zone(Id=r53_zone_ids[0])["HostedZone"]["Name"] + hosted_zone = self.r53.get_hosted_zone(Id=r53_zone_ids[0])["HostedZone"] + route53_hosted_zone_name = hosted_zone["Name"] + route53_hosted_zone_private = hosted_zone["Config"]["PrivateZone"] subnet_result = self.ec2.describe_subnets(SubnetIds=get_subnet_ids("Private")) az_zone_ids = [s["AvailabilityZoneId"] for s in subnet_result["Subnets"]] @@ -650,6 +653,7 @@ def get_subnet_ids(subnet_type: str, prefix: str = "VPC"): "enabled": False, }, "route53_hosted_zone_name": route53_hosted_zone_name, + "route53_hosted_zone_private": route53_hosted_zone_private, "bastion": { "enabled": eks_cluster_result["cluster"]["resourcesVpcConfig"]["endpointPrivateAccess"], },