Refactored submodule to return liqo helm chart values only

Author: andrejatcastai

main.tf

@@ -1,16 +1,20 @@
 locals {
+  liqo_chart_repo   = "https://castai.github.io/liqo"
+  liqo_chart_name   = "liqo"
+  liqo_release_name = "omni"
+  liqo_image_tag    = var.liqo_chart_version
+
   omni_namespace         = "castai-omni"
   omni_agent_release     = "omni-agent"
   omni_agent_chart       = "omni-agent"
   castai_helm_repository = "https://castai.github.io/helm-charts"
 }
 
-# OCI Cloud Resources (created first to provide attributes to edge location)
-module "liqo" {
+# Compute Liqo Helm chart configuration
+module "liqo_helm_values" {
   source = "./modules/gke"
 
-  namespace             = local.omni_namespace
-  liqo_chart_version    = var.liqo_chart_version
+  image_tag             = local.liqo_image_tag
   cluster_name          = var.cluster_name
   cluster_region        = var.cluster_region
   cluster_zone          = var.cluster_zone
@@ -20,6 +24,20 @@ module "liqo" {
   reserved_subnet_cidrs = var.reserved_subnet_cidrs
 }
 
+# Liqo Helm Release
+resource "helm_release" "liqo" {
+  name             = local.liqo_release_name
+  repository       = local.liqo_chart_repo
+  chart            = local.liqo_chart_name
+  version          = var.liqo_chart_version
+  namespace        = local.omni_namespace
+  create_namespace = true
+  cleanup_on_fail  = true
+  wait             = true
+
+  set = module.liqo_helm_values.set_values
+}
+
 # Wait for Liqo network resources to be ready before proceeding
 resource "null_resource" "wait_for_liqo_network" {
   provisioner "local-exec" {
@@ -54,7 +72,7 @@ resource "null_resource" "wait_for_liqo_network" {
     EOT
   }
 
-  depends_on = [module.liqo]
+  depends_on = [helm_release.liqo]
 }
 
 # Extract the external CIDR value from Liqo network resource

modules/gke/main.tf

@@ -1,44 +1,67 @@
 locals {
-  liqo_release_name = "omni"
-  liqo_chart_repo   = "https://castai.github.io/liqo"
-  liqo_chart_name   = "liqo"
+  pools_cidrs = ["10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", var.service_cidr]
 
-  # Format reserved subnet CIDRs as YAML array with proper indentation
-  pools_cidrs      = ["10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", var.service_cidr]
-  pools_cidrs_yaml = length(local.pools_cidrs) > 0 ? join("\n    ", [
-    for cidr in local.pools_cidrs : "- ${cidr}"
-  ]) : "[]"
-
-  reserved_subnets_yaml = length(var.reserved_subnet_cidrs) > 0 ? join("\n    ", [
-    for cidr in var.reserved_subnet_cidrs : "- ${cidr}"
-  ]) : "[]"
+  basic_set_values = [
+    {
+      name  = "tag"
+      value = var.image_tag
+    },
+    {
+      name  = "apiServer.address"
+      value = var.api_server_address
+    },
+    {
+      name  = "discovery.config.clusterID"
+      value = var.cluster_name
+    },
+    {
+      name  = "discovery.config.clusterLabels.liqo\\.io/provider"
+      value = "gke"
+    },
+    {
+      name  = "discovery.config.clusterLabels.topology\\.kubernetes\\.io/region"
+      value = var.cluster_region
+    },
+    {
+      name  = "ipam.podCIDR"
+      value = var.pod_cidr
+    },
+    {
+      name  = "ipam.serviceCIDR"
+      value = var.service_cidr
+    },
+    {
+      name  = "telemetry.enabled"
+      value = "false"
+    }
+  ]
 
-  # Render the values file with variable substitutions
-  liqo_helm_values = templatefile("${path.module}/templates/values.yaml", {
-    cluster_name           = var.cluster_name
-    liqo_version           = var.liqo_chart_version
-    api_server_address     = var.api_server_address
-    cluster_region         = var.cluster_region
-    cluster_zone           = var.cluster_zone
-    pod_cidr               = var.pod_cidr
-    service_cidr           = var.service_cidr
-    pools_cidrs            = local.pools_cidrs_yaml
-    reserved_subnets_cidrs = local.reserved_subnets_yaml
-  })
-}
+  # Conditional zone label
+  zone_set_values = var.cluster_zone != "" ? [
+    {
+      name  = "discovery.config.clusterLabels.topology\\.kubernetes\\.io/zone"
+      value = var.cluster_zone
+    }
+  ] : []
 
-# Liqo Helm Release
-resource "helm_release" "liqo" {
-  name             = local.liqo_release_name
-  repository       = local.liqo_chart_repo
-  chart            = local.liqo_chart_name
-  version          = var.liqo_chart_version
-  namespace        = var.namespace
-  create_namespace = true
-  cleanup_on_fail  = true
-  wait             = true
+  pools_set_values = [
+    for idx, cidr in local.pools_cidrs : {
+      name  = "ipam.pools[${idx}]"
+      value = cidr
+    }
+  ]
 
-  values = [
-    local.liqo_helm_values
+  reserved_subnets_set_values = [
+    for idx, cidr in var.reserved_subnet_cidrs : {
+      name  = "ipam.reservedSubnets[${idx}]"
+      value = cidr
+    }
   ]
+
+  all_set_values = concat(
+    local.basic_set_values,
+    local.zone_set_values,
+    local.pools_set_values,
+    local.reserved_subnets_set_values
+  )
 }

modules/gke/outputs.tf

@@ -1,19 +1,4 @@
-output "liqo_release_name" {
-  description = "Name of the liqo Helm release"
-  value       = helm_release.liqo.name
+output "set_values" {
+  description = "All Helm set values for liqo configuration"
+  value       = local.all_set_values
 }
-
-output "liqo_namespace" {
-  description = "Namespace where liqo is installed"
-  value       = helm_release.liqo.namespace
-}
-
-output "liqo_version" {
-  description = "Version of the liqo Helm chart installed"
-  value       = helm_release.liqo.version
-}
-
-output "liqo_status" {
-  description = "Status of the liqo Helm release"
-  value       = helm_release.liqo.status
-}