fix: switch default ingress controller at 36

Signed-off-by: matttrach <matt.trachier@suse.com>

Author: matttrach

examples/downstream/modules/downstream/main.tf

@@ -24,6 +24,8 @@ locals {
   ssh_access_user = (var.direct_node_access != null ? var.direct_node_access.ssh_access_user : "fake")
   # rke2 info
   rke2_version             = var.rke2_version
+  rke2_minor               = tonumber(split(".", local.rke2_version)[1])
+  default_ingress          = local.rke2_minor >= 36 ? "traefik" : "nginx"
   rke2_ingress_config_name = "rke2-ingress-config"
   rke2_ingress_config_key  = "config"
 }
@@ -108,7 +110,7 @@ resource "terraform_data" "ingress_config" {
         annotations:
           rke.cattle.io/object-authorized-for-clusters: ${local.cluster_name}
       data:
-        "${local.rke2_ingress_config_key}": "ingress-controller: traefik"
+        "${local.rke2_ingress_config_key}": "ingress-controller: ${local.default_ingress}"
       EOF
     EOT
   }
@@ -152,7 +154,7 @@ resource "rancher2_cluster_v2" "rke2_cluster" {
           name = local.rke2_ingress_config_name
           items {
             key  = local.rke2_ingress_config_key
-            path = "/etc/rancher/rke2/config.yaml.d/51-rke2-ingress-traefik.yaml"
+            path = "/etc/rancher/rke2/config.yaml.d/51-rke2-ingress.yaml"
           }
         }
       }

examples/prod/main.tf

@@ -32,7 +32,7 @@ locals {
   owner                = var.owner
   rke2_version         = var.rke2_version
   rke2_minor           = tonumber(split(".", local.rke2_version)[1])
-  default_ingress      = local.rke2_minor >= 35 ? "traefik" : "nginx"
+  default_ingress      = local.rke2_minor >= 36 ? "traefik" : "nginx"
   local_file_path      = var.file_path
   runner_ip            = chomp(data.http.myip.response_body) # "runner" is the server running Terraform
   rancher_version      = var.rancher_version

modules/install_rancher/rancher/main.tf

@@ -23,7 +23,7 @@ locals {
     "ingress.enabled"                                     = "true"
     "ingress.tls.source"                                  = "letsEncrypt"
     "tls"                                                 = "ingress"
-    "letsEncrypt.ingress.class"                           = (local.rke2_minor >= 35 ? "traefik" : "nginx")
+    "letsEncrypt.ingress.class"                           = (local.rke2_minor >= 36 ? "traefik" : "nginx")
     "letsEncrypt.environment"                             = "production"
     "letsEncrypt.email"                                   = local.email
     "certmanager.version"                                 = local.cert_manager_version

modules/install_rancher/rancher_externalTLS/main.tf

@@ -5,7 +5,7 @@ locals {
   rancher_version           = replace(var.rancher_version, "v", "") # don't include the v
   rke2_version              = var.rke2_version
   rke2_minor                = tonumber(split(".", local.rke2_version)[1])
-  default_ingress           = (local.rke2_minor >= 35 ? "traefik" : "nginx")
+  default_ingress           = (local.rke2_minor >= 36 ? "traefik" : "nginx")
   helm_chart_use_strategy   = var.rancher_helm_chart_use_strategy
   rancher_helm_chart_values = jsondecode(base64decode(var.rancher_helm_chart_values))
   public_cert               = base64decode(var.public_cert)