diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index beb53796..ca8bb404 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -177,7 +177,9 @@ jobs: ssh-keygen -t rsa -f dummy.pem -N '' export DEPLOY_ID="$NAME" - export MOD_VERSION="v3.0.10" + export MOD_VALIDATION_OFF="true" + export MOD_VERSION="miguelhar.pvt-hosted-zone" + envsubst < config.tpl | tee config.yaml ./convert.py check-requirements diff --git a/convert/lib/convert.py b/convert/lib/convert.py index 79fd4555..3ff7f03c 100755 --- a/convert/lib/convert.py +++ b/convert/lib/convert.py @@ -568,6 +568,7 @@ def get_subnet_ids(subnet_type: str, prefix: str = "VPC"): eks_cluster_result = self.eks.describe_cluster(name=self.cdkconfig["name"]) eks_k8s_version = eks_cluster_result["cluster"]["version"] eks_cluster_auto_sg = eks_cluster_result["cluster"]["resourcesVpcConfig"]["clusterSecurityGroupId"] + k8s_service_ipv4_cidr = eks_cluster_result["cluster"]["kubernetesNetworkConfig"]["serviceIpv4Cidr"] route53_hosted_zone_name = None route53_hosted_zone_private = False @@ -595,6 +596,7 @@ def get_subnet_ids(subnet_type: str, prefix: str = "VPC"): } eks = { + "service_ipv4_cidr": k8s_service_ipv4_cidr, "k8s_version": eks_k8s_version, "public_access": { "enabled": eks_cluster_result["cluster"]["resourcesVpcConfig"]["endpointPublicAccess"],