Got rid of reserved CIDR's for EKS

Author: andrejatcastai

main.tf

@@ -1,3 +1,10 @@
+check "reserved_cidrs_required_for_gke" {
+  assert {
+    condition     = var.k8s_provider != "gke" || (var.reserved_subnet_cidrs != null && length(var.reserved_subnet_cidrs) > 0)
+    error_message = "'reserved_subnet_cidrs' must be provided for GKE cluster"
+  }
+}
+
 locals {
   liqo_chart_repo   = "https://castai.github.io/liqo"
   liqo_chart_name   = "liqo"
@@ -42,13 +49,12 @@ module "liqo_helm_values_eks" {
   count  = var.k8s_provider == "eks" ? 1 : 0
   source = "./modules/eks"
 
-  image_tag             = local.liqo_image_tag
-  cluster_name          = var.cluster_name
-  cluster_region        = var.cluster_region
-  api_server_address    = var.api_server_address
-  pod_cidr              = var.pod_cidr
-  service_cidr          = var.service_cidr
-  reserved_subnet_cidrs = var.reserved_subnet_cidrs
+  image_tag          = local.liqo_image_tag
+  cluster_name       = var.cluster_name
+  cluster_region     = var.cluster_region
+  api_server_address = var.api_server_address
+  pod_cidr           = var.pod_cidr
+  service_cidr       = var.service_cidr
 }
 
 # Liqo Helm Release

modules/eks/main.tf

@@ -47,13 +47,6 @@ locals {
     }
   ]
 
-  reserved_subnets_set_values = [
-    for idx, cidr in var.reserved_subnet_cidrs : {
-      name  = "ipam.reservedSubnets[${idx}]"
-      value = cidr
-    }
-  ]
-
   eks_specific_set_values = [
     {
       name  = "networking.fabric.config.fullMasquerade"
@@ -68,7 +61,6 @@ locals {
   all_set_values = concat(
     local.basic_set_values,
     local.pools_set_values,
-    local.reserved_subnets_set_values,
     local.eks_specific_set_values
   )
 }

modules/eks/variables.tf

@@ -27,9 +27,3 @@ variable "service_cidr" {
   description = "Service CIDR for IPAM configuration"
   type        = string
 }
-
-variable "reserved_subnet_cidrs" {
-  description = "List of subnet CIDRs for IPAM reserved subnets"
-  type        = list(string)
-  default     = []
-}

modules/gke/variables.tf

@@ -37,5 +37,4 @@ variable "service_cidr" {
 variable "reserved_subnet_cidrs" {
   description = "List of subnet CIDRs for IPAM reserved subnets"
   type        = list(string)
-  default     = []
 }

variables.tf

@@ -67,6 +67,7 @@ variable "service_cidr" {
 }
 
 variable "reserved_subnet_cidrs" {
-  description = "List of reserved subnet CIDR's"
+  description = "List of reserved subnet CIDR's (relevant for GKE)"
   type        = list(string)
+  default     = []
 }