Skip to content

Commit

Permalink
Adds k8s service_ipv4_cidr
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelhar committed Oct 7, 2023
1 parent e61ffb9 commit 71712ec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions convert/lib/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"],
Expand Down

0 comments on commit 71712ec

Please sign in to comment.