Merge pull request #322 from kbst/eks-svc-cidr-default-null

EKS: Allow configuring Service CIDR
kbst · Oct 6, 2023 · 81918aa · 81918aa
2 parents ca6a963 + 9c3a1b3
commit 81918aa
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -50,6 +50,14 @@ jobs:
       id-token: write # needed for keyless signing
 
     steps:
+    - name: 'Free disk space'
+      # https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
+      run: |
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /opt/ghc
+        sudo rm -rf /usr/local/share/boost
+        sudo rm -rf $AGENT_TOOLSDIRECTORY
+
     - name: 'Checkout'
       uses: actions/checkout@v3
 

diff --git a/aws/_modules/eks/master.tf b/aws/_modules/eks/master.tf
@@ -10,6 +10,13 @@ resource "aws_eks_cluster" "current" {
     public_access_cidrs     = var.cluster_public_access_cidrs
   }
 
+  dynamic "kubernetes_network_config" {
+    for_each = var.cluster_service_cidr != null ? toset([1]) : toset([])
+    content {
+      service_ipv4_cidr = var.cluster_service_cidr
+    }
+  }
+
   dynamic "encryption_config" {
     for_each = var.cluster_encryption_key_arn != null ? toset([1]) : toset([])
     content {

diff --git a/aws/_modules/eks/variables.tf b/aws/_modules/eks/variables.tf
@@ -160,6 +160,12 @@ variable "cluster_public_access_cidrs" {
   description = "List of CIDR blocks which can access the Amazon EKS public API server endpoint. EKS defaults this to a list with 0.0.0.0/0."
 }
 
+variable "cluster_service_cidr" {
+  type        = string
+  default     = null
+  description = "Sets the Service CIDR for the EKS cluster."
+}
+
 variable "cluster_encryption_key_arn" {
   type        = string
   default     = null

diff --git a/aws/cluster/configuration.tf b/aws/cluster/configuration.tf
@@ -82,6 +82,7 @@ locals {
   cluster_endpoint_public_access     = lookup(local.cfg, "cluster_endpoint_public_access", true)
   cluster_public_access_cidrs_lookup = lookup(local.cfg, "cluster_public_access_cidrs", null)
   cluster_public_access_cidrs        = local.cluster_public_access_cidrs_lookup == null ? null : split(",", local.cluster_public_access_cidrs_lookup)
+  cluster_service_cidr               = lookup(local.cfg, "cluster_service_cidr", null)
 
   cluster_encryption_key_arn = lookup(local.cfg, "cluster_encryption_key_arn", null)
 }
diff --git a/aws/cluster/main.tf b/aws/cluster/main.tf
@@ -55,6 +55,7 @@ module "cluster" {
   cluster_endpoint_private_access = local.cluster_endpoint_private_access
   cluster_endpoint_public_access  = local.cluster_endpoint_public_access
   cluster_public_access_cidrs     = local.cluster_public_access_cidrs
+  cluster_service_cidr            = local.cluster_service_cidr
 
   cluster_encryption_key_arn = local.cluster_encryption_key_arn