fixup! feat: cluster per EL onboarding

Author: fra98

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

@@ -17,9 +17,6 @@ module "castai_omni_cluster" {
   pod_cidr           = data.azurerm_kubernetes_cluster.aks.network_profile[0].pod_cidr
   service_cidr       = data.azurerm_kubernetes_cluster.aks.network_profile[0].service_cidr
 
-  storage_provider      = ""
-  loadbalancer_provider = ""
-
   skip_helm = var.skip_helm
 }
 

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

@@ -22,9 +22,6 @@ module "castai_omni_cluster" {
   pod_cidr           = data.aws_vpc.eks_vpc.cidr_block
   service_cidr       = data.aws_eks_cluster.eks.kubernetes_network_config[0].service_ipv4_cidr
 
-  storage_provider      = "gp3"
-  loadbalancer_provider = "external" // External requires AWS Load Balancer Controller to be installed in the cluster. Set to "nlb" to use legacy in-tree LB provider.
-
   skip_helm = var.skip_helm
 }
 

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

@@ -38,9 +38,6 @@ module "castai_omni_cluster" {
   service_cidr          = data.google_container_cluster.gke.services_ipv4_cidr
   reserved_subnet_cidrs = [data.google_compute_subnetwork.gke_subnet.ip_cidr_range]
 
-  storage_provider      = "premium-rwo"
-  loadbalancer_provider = ""
-
   skip_helm = var.skip_helm
 }
 

main.tf

@@ -48,6 +48,9 @@ locals {
   castai_helm_repository  = "https://castai.github.io/helm-charts"
   castai_agent_secret_ref = "castai-omni-agent-token"
 
+  storage_provider      = var.storage_provider != null ? var.storage_provider : (var.k8s_provider == "gke" ? "premium-rwo" : (var.k8s_provider == "eks" ? "gp3" : ""))
+  loadbalancer_provider = var.loadbalancer_provider != null ? var.loadbalancer_provider : (var.k8s_provider == "eks" ? "external" : "")
+
   # 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 },
@@ -60,15 +63,16 @@ locals {
   helm_yaml_values = {
     castai = {
       apiUrl          = var.api_url
+      grpcAddr        = var.kvisor_grpc_url
       apiKeySecretRef = local.castai_agent_secret_ref
       organizationID  = var.organization_id
       clusterID       = var.cluster_id
       clusterName     = var.cluster_name
     }
     liqo = local.liqo_yaml_values[var.k8s_provider].liqo
     edgeCluster = {
-      storageProvider      = var.storage_provider
-      loadBalancerProvider = var.loadbalancer_provider
+      storageProvider      = local.storage_provider
+      loadBalancerProvider = local.loadbalancer_provider
     }
   }
 }

variables.tf

@@ -13,6 +13,12 @@ variable "api_url" {
   default     = "https://api.cast.ai"
 }
 
+variable "kvisor_grpc_url" {
+  description = "Kvisor gRPC URL"
+  type        = string
+  default     = "kvisor.prod-master.cast.ai:443"
+}
+
 variable "api_token" {
   description = "CAST AI API token (key) for authentication"
   type        = string
@@ -56,13 +62,15 @@ variable "reserved_subnet_cidrs" {
 }
 
 variable "storage_provider" {
-  description = "Storage provider for the edge clusters. Recommended are `premium-rwo` for GKE and `gp3` for EKS. Leave empty to use the default storageclass for your cluster."
+  description = "Storage provider (storageclass) for the edge clusters. If empty, they will be defaulted to `premium-rwo` for GKE and `gp3` for EKS"
   type        = string
+  default     = null
 }
 
 variable "loadbalancer_provider" {
-  description = "LoadBalancer provider for edge cluster. This setting is used only for EKS clusters: accepted values: `nlb` and `external`)."
+  description = "LoadBalancer provider for edge cluster. This setting is used only for EKS clusters (accepted values are `nlb` and `external`). If empty, it will be defaulted to `external` for EKS"
   type        = string
+  default     = null
 }
 
 variable "omni_agent_chart_version" {