This is an automated email from the ASF dual-hosted git repository. shahar1 pushed a commit to branch gha-arc-rebase in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git
commit d4bf9f9283df3d509ad548d32d4c7029feeba996 Author: Hussein Awala <[email protected]> AuthorDate: Sun Aug 13 15:56:27 2023 +0200 Disable NAT gateway and move EKS nodes to public subnets --- README.rst | 12 ++++++++---- terraform/eks/eks.tf | 2 +- terraform/eks/vpc.tf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 6d3bff2..aa47573 100644 --- a/README.rst +++ b/README.rst @@ -81,11 +81,15 @@ And for Helm, you mainly need two commands: .. code-block:: bash - # diff the helmfiles to compare the current state with the desired state - helmfile -f helm diff + # diff the infra helmfile to compare the current state with the desired state + helmfile -f helm/infra-helmfile.yaml diff - # apply the helmfiles to deploy the desired state - helmfile -f helm apply + # apply the helmfiles to deploy the desired state + helmfile -f helm/infra-helmfile.yaml apply + + # same for ci helmfile + helmfile -f helm/ci-helmfile.yaml diff + helmfile -f helm/ci-helmfile.yaml apply For Docker, we build a custom image for the runners, based on the official `Dockerfiles`_ provided by Github, but with the `Airflow runner release`_ managed by `Ash`_ instead of the official one, and with python installed on the image diff --git a/terraform/eks/eks.tf b/terraform/eks/eks.tf index 6850e95..8d657ab 100644 --- a/terraform/eks/eks.tf +++ b/terraform/eks/eks.tf @@ -29,7 +29,7 @@ module "eks" { cluster_version = "1.27" vpc_id = module.vpc.vpc_id - subnet_ids = module.vpc.private_subnets + subnet_ids = module.vpc.public_subnets cluster_endpoint_public_access = true diff --git a/terraform/eks/vpc.tf b/terraform/eks/vpc.tf index 121b054..cdc5758 100644 --- a/terraform/eks/vpc.tf +++ b/terraform/eks/vpc.tf @@ -28,10 +28,11 @@ module "vpc" { private_subnets = ["10.1.1.0/24", "10.1.2.0/24", "10.1.3.0/24"] public_subnets = ["10.1.4.0/24", "10.1.5.0/24", "10.1.6.0/24"] - enable_nat_gateway = true - single_nat_gateway = true + enable_nat_gateway = false enable_dns_hostnames = true + map_public_ip_on_launch = true + public_subnet_tags = { "kubernetes.io/cluster/${local.cluster_name}" = "shared" "kubernetes.io/role/elb" = 1
