Refactor and cleanup liqo helm values (#18)

Author: fra98

.gitignore

@@ -6,6 +6,7 @@
 *.tfstate
 *.tfstate.*
 *.tfvars
+examples/**/**/tf.vars
 
 # AI
 CLAUDE.md

README.md

@@ -93,19 +93,13 @@ module "castai-omni-cluster" {
   reserved_subnet_cidrs = [data.google_compute_subnetwork.gke_subnet.ip_cidr_range]
 }
 
-module "castai_gcp_edge_location" {
-  source = "github.com/castai/terraform-castai-omni-edge-location"
+module "castai_omni_edge_location_gcp" {
+  source = "castai/omni-edge-location-gcp/castai"
 
   cluster_id      = var.cluster_id
   organization_id = var.organization_id
 
-  gcp = {
-    region = "europe-west4"
-  }
-
-  tags = {
-    ManagedBy = "terraform"
-  }
+  region = "europe-west4"
 
   depends_on = [module.castai-omni-cluster]
 }
@@ -139,7 +133,7 @@ locals {
 }
 
 module "castai_omni_cluster" {
-  source = "github.com/castai/terraform-castai-omni-cluster"
+  source = "castai/omni-cluster/castai"
 
   k8s_provider    = "eks"  # Specify cloud provider: "gke", "eks", or "aks"
   api_url         = var.castai_api_url
@@ -170,7 +164,7 @@ data "azurerm_virtual_network" "aks_vnet" {
 }
 
 module "castai_omni_cluster" {
-  source = "github.com/castai/terraform-castai-omni-cluster"
+  source = "castai/omni-cluster/castai"
 
   k8s_provider    = "aks"  # Specify cloud provider: "gke", "eks", or "aks"
   api_url         = var.castai_api_url
@@ -193,7 +187,7 @@ When using GitOps tools like ArgoCD or Flux, you can skip the Helm chart install
 
 ```hcl
 module "castai_omni_cluster" {
-  source = "github.com/castai/terraform-castai-omni-cluster"
+  source = "castai/omni-cluster/castai"
 
   k8s_provider    = "gke"
   api_url         = var.castai_api_url
@@ -498,10 +492,13 @@ Complete working examples are available for all supported cloud providers:
 
 ## Related Modules
 
-- [terraform-castai-omni-edge-location](https://github.com/castai/terraform-castai-omni-edge-location) - Create and manage edge locations for Omni clusters
+- [terraform-castai-omni-cluster](https://github.com/castai/terraform-castai-omni-cluster) - Create and manage Omni clusters
+- [terraform-castai-omni-edge-location-gcp](https://github.com/castai/terraform-castai-omni-edge-location-gcp) - Create and manage GCP edge locations for Omni clusters
+- [terraform-castai-omni-edge-location-aws](https://github.com/castai/terraform-castai-omni-edge-location-aws) - Create and manage AWS edge locations for Omni clusters
+- [terraform-castai-omni-edge-location-oci](https://github.com/castai/terraform-castai-omni-edge-location-oci) - Create and manage OCI edge locations for Omni clusters
 - [terraform-castai-gke-cluster](https://github.com/castai/terraform-castai-gke-cluster) - Onboard GKE clusters to CAST AI
 - [terraform-castai-eks-cluster](https://github.com/castai/terraform-castai-eks-cluster) - Onboard EKS clusters to CAST AI
-- [terraform-castai-aks-cluster](https://github.com/castai/terraform-castai-aks-cluster) - Onboard AKS clusters to CAST AI
+- [terraform-castai-aks-cluster](https://github.com/castai/terraform-castai-aks) - Onboard AKS clusters to CAST AI
 
 ## License
 
@@ -522,15 +519,14 @@ MIT
 
 | Name | Version |
 |------|---------|
-| <a name="provider_castai"></a> [castai](#provider\_castai) | 8.6.0 |
+| <a name="provider_castai"></a> [castai](#provider\_castai) | 8.8.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | 3.1.1 |
 | <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 3.0.1 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_liqo_helm_values"></a> [liqo\_helm\_values](#module\_liqo\_helm\_values) | cloudposse/config/yaml//modules/deepmerge | 0.2.0 |
 | <a name="module_liqo_helm_values_aks"></a> [liqo\_helm\_values\_aks](#module\_liqo\_helm\_values\_aks) | ./modules/aks | n/a |
 | <a name="module_liqo_helm_values_eks"></a> [liqo\_helm\_values\_eks](#module\_liqo\_helm\_values\_eks) | ./modules/eks | n/a |
 | <a name="module_liqo_helm_values_gke"></a> [liqo\_helm\_values\_gke](#module\_liqo\_helm\_values\_gke) | ./modules/gke | n/a |
@@ -554,10 +550,8 @@ MIT
 | <a name="input_api_url"></a> [api\_url](#input\_api\_url) | CAST AI API URL | `string` | `"https://api.cast.ai"` | no |
 | <a name="input_cluster_id"></a> [cluster\_id](#input\_cluster\_id) | CAST AI cluster ID to enable Omni functionality for | `string` | n/a | yes |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | CAST AI cluster name | `string` | n/a | yes |
-| <a name="input_cluster_region"></a> [cluster\_region](#input\_cluster\_region) | K8s cluster region | `string` | n/a | yes |
-| <a name="input_cluster_zone"></a> [cluster\_zone](#input\_cluster\_zone) | K8s cluster zone | `string` | `""` | no |
 | <a name="input_k8s_provider"></a> [k8s\_provider](#input\_k8s\_provider) | Kubernetes cloud provider (gke, eks, aks) | `string` | n/a | yes |
-| <a name="input_omni_agent_chart_version"></a> [omni\_agent\_chart\_version](#input\_omni\_agent\_chart\_version) | OMNI agent helm chart version | `string` | `"v1.1.8"` | no |
+| <a name="input_omni_agent_chart_version"></a> [omni\_agent\_chart\_version](#input\_omni\_agent\_chart\_version) | OMNI agent helm chart version | `string` | `"v1.1.9"` | no |
 | <a name="input_organization_id"></a> [organization\_id](#input\_organization\_id) | CAST AI organization ID | `string` | n/a | yes |
 | <a name="input_pod_cidr"></a> [pod\_cidr](#input\_pod\_cidr) | Pod CIDR for network configuration | `string` | n/a | yes |
 | <a name="input_reserved_subnet_cidrs"></a> [reserved\_subnet\_cidrs](#input\_reserved\_subnet\_cidrs) | List of reserved subnet CIDR's (relevant for GKE) | `list(string)` | `[]` | no |

examples/onboarding-with-existing-aks-cluster/main.tf

@@ -12,7 +12,6 @@ module "castai_omni_cluster" {
   organization_id = var.organization_id
   cluster_id      = var.cluster_id
   cluster_name    = var.aks_cluster_name
-  cluster_region  = data.azurerm_kubernetes_cluster.aks.location
 
   api_server_address = "https://${data.azurerm_kubernetes_cluster.aks.fqdn}"
   pod_cidr           = data.azurerm_kubernetes_cluster.aks.network_profile[0].pod_cidr
@@ -22,7 +21,8 @@ module "castai_omni_cluster" {
 }
 
 module "castai_omni_edge_location_gcp" {
-  source = "github.com/castai/terraform-castai-omni-edge-location-gcp"
+  source  = "castai/omni-edge-location-gcp/castai"
+  version = "~> 1"
 
   cluster_id      = module.castai_omni_cluster.cluster_id
   organization_id = module.castai_omni_cluster.organization_id

examples/onboarding-with-existing-eks-cluster/main.tf

@@ -17,7 +17,6 @@ module "castai_omni_cluster" {
   organization_id = var.organization_id
   cluster_id      = var.cluster_id
   cluster_name    = var.eks_cluster_name
-  cluster_region  = var.eks_cluster_region
 
   api_server_address = data.aws_eks_cluster.eks.endpoint
   pod_cidr           = data.aws_vpc.eks_vpc.cidr_block
@@ -26,8 +25,9 @@ module "castai_omni_cluster" {
   skip_helm = var.skip_helm
 }
 
-module "castai_aws_edge_location" {
-  source = "github.com/castai/terraform-castai-omni-edge-location-aws"
+module "castai_omni_edge_location_aws" {
+  source  = "castai/omni-edge-location-aws/castai"
+  version = "~> 1"
 
   providers = {
     aws = aws.eu_west_1
@@ -36,6 +36,7 @@ module "castai_aws_edge_location" {
   cluster_id      = module.castai_omni_cluster.cluster_id
   organization_id = module.castai_omni_cluster.organization_id
   region          = "eu-west-1"
+  zones           = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
 
   tags = {
     ManagedBy = "terraform"

examples/onboarding-with-existing-gke-cluster/main.tf

@@ -14,7 +14,6 @@ locals {
   # Determine region from location (if zonal, extract region; if regional, use as-is)
   is_zonal_cluster = length(regexall("^.*-[a-z]$", var.gke_cluster_location)) > 0
   cluster_region   = local.is_zonal_cluster ? regex("^(.*)-[a-z]$", var.gke_cluster_location)[0] : var.gke_cluster_location
-  cluster_zone     = local.is_zonal_cluster ? var.gke_cluster_location : ""
 }
 
 # Get subnet details to retrieve the IP CIDR range
@@ -33,8 +32,6 @@ module "castai_omni_cluster" {
   organization_id = var.organization_id
   cluster_id      = var.cluster_id
   cluster_name    = var.gke_cluster_name
-  cluster_region  = local.cluster_region
-  cluster_zone    = local.cluster_zone
 
   api_server_address    = "https://${data.google_container_cluster.gke.endpoint}"
   pod_cidr              = data.google_container_cluster.gke.cluster_ipv4_cidr
@@ -45,7 +42,8 @@ module "castai_omni_cluster" {
 }
 
 module "castai_omni_edge_location_gcp" {
-  source = "github.com/castai/terraform-castai-omni-edge-location-gcp"
+  source  = "castai/omni-edge-location-gcp/castai"
+  version = "~> 1"
 
   cluster_id      = module.castai_omni_cluster.cluster_id
   organization_id = module.castai_omni_cluster.organization_id

examples/onboarding-with-existing-gke-cluster/variables.tf

@@ -4,7 +4,7 @@ variable "gke_project_id" {
 }
 
 variable "gke_cluster_location" {
-  description = "GKE Cluster Location"
+  description = "GKE Cluster Location (region or zone)"
   type        = string
 }
 

main.tf

@@ -11,8 +11,6 @@ module "liqo_helm_values_gke" {
   source = "./modules/gke"
 
   cluster_name          = var.cluster_name
-  cluster_region        = var.cluster_region
-  cluster_zone          = var.cluster_zone
   api_server_address    = var.api_server_address
   pod_cidr              = var.pod_cidr
   service_cidr          = var.service_cidr
@@ -25,7 +23,6 @@ module "liqo_helm_values_eks" {
   source = "./modules/eks"
 
   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
@@ -37,8 +34,6 @@ module "liqo_helm_values_aks" {
   source = "./modules/aks"
 
   cluster_name       = var.cluster_name
-  cluster_region     = var.cluster_region
-  cluster_zone       = var.cluster_zone
   api_server_address = var.api_server_address
   pod_cidr           = var.pod_cidr
   service_cidr       = var.service_cidr
@@ -51,18 +46,6 @@ locals {
   castai_helm_repository  = "https://castai.github.io/helm-charts"
   castai_agent_secret_ref = "castai-omni-agent-token"
 
-  # Common Liqo configuration as YAML
-  common_liqo_yaml_values = {
-    networking = {
-      fabric = {
-        config = {
-          healthProbeBindAddressPort = "7071"
-          metricsAddressPort = "7072"
-        }
-      }
-    }
-  }
-
   # Select the appropriate yaml_values based on k8s_provider
   liqo_yaml_values = merge(
     { for v in module.liqo_helm_values_gke : "gke" => v.liqo_yaml_values },
@@ -71,15 +54,6 @@ locals {
   )
 }
 
-module "liqo_helm_values" {
-  source  = "cloudposse/config/yaml//modules/deepmerge"
-  version = "0.2.0"
-  maps = [
-    local.common_liqo_yaml_values,
-    local.liqo_yaml_values[var.k8s_provider].liqo,
-  ]
-}
-
 locals {
   helm_yaml_values = {
     castai = {
@@ -89,7 +63,7 @@ locals {
       clusterID       = var.cluster_id
       clusterName     = var.cluster_name
     }
-    liqo = module.liqo_helm_values.merged
+    liqo = local.liqo_yaml_values[var.k8s_provider].liqo
   }
 }
 

modules/aks/main.tf

@@ -1,6 +1,5 @@
 locals {
   pools_cidrs = ["10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", var.service_cidr]
-  provider    = "aks"
 
   liqo_yaml_values = {
     liqo = {
@@ -11,15 +10,6 @@ locals {
       discovery = {
         config = {
           clusterID = var.cluster_name
-          clusterLabels = merge(
-            {
-              "liqo.io/provider"              = local.provider
-              "topology.kubernetes.io/region" = var.cluster_region
-            },
-            var.cluster_zone != "" ? {
-              "topology.kubernetes.io/zone" = var.cluster_zone
-            } : {}
-          )
         }
       }
       ipam = {
@@ -30,6 +20,22 @@ locals {
       telemetry = {
         enabled = false
       }
+      networking = {
+        fabric = {
+          config = {
+            gatewayMasqueradeBypass = true
+          }
+        }
+      }
+      virtualKubelet = {
+        virtualNode = {
+          extra = {
+            labels = {
+              "kubernetes.azure.com/managed" = "false"
+            }
+          }
+        }
+      }
     }
   }
 }

modules/aks/variables.tf

@@ -1,19 +1,8 @@
 variable "cluster_name" {
-  description = "GKE cluster name"
+  description = "AKS cluster name"
   type        = string
 }
 
-variable "cluster_region" {
-  description = "GKE region for topology labels"
-  type        = string
-}
-
-variable "cluster_zone" {
-  description = "GKE zone for topology labels (optional)"
-  type        = string
-  default     = ""
-}
-
 variable "api_server_address" {
   description = "Kubernetes API server address"
   type        = string

modules/eks/main.tf

@@ -1,6 +1,5 @@
 locals {
   pools_cidrs = ["10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", var.service_cidr]
-  provider    = "eks"
 
   liqo_yaml_values = {
     liqo = {
@@ -11,10 +10,6 @@ locals {
       discovery = {
         config = {
           clusterID = var.cluster_name
-          clusterLabels = {
-            "liqo.io/provider"              = local.provider
-            "topology.kubernetes.io/region" = var.cluster_region
-          }
         }
       }
       ipam = {
@@ -25,25 +20,16 @@ locals {
       telemetry = {
         enabled = false
       }
-      virtualKubelet = {
-        extra = {
-          args = ["--certificate-type=aws"]
-        }
-      }
       networking = {
         fabric = {
           config = {
             fullMasquerade = true
           }
         }
-        gatewayTemplates = {
-          server = {
-            service = {
-              annotations = {
-                "service.beta.kubernetes.io/aws-load-balancer-type" = "nlb"
-              }
-            }
-          }
+      }
+      virtualKubelet = {
+        extra = {
+          args = ["--certificate-type=aws"]
         }
       }
     }