Merge pull request #7 from bennu/feat/k8s-1.24

chore: changed calico chart repository, upgraded to v3.25.0

Author: cdely-bennu

bootstrap.tf

@@ -286,9 +286,6 @@ resource "helm_release" "cilium" {
         }
         ipam = {
           mode = var.cilium_ipam
-          operator = {
-            clusterPoolIPv4PodCIDRList = [var.cluster_cidr]
-          }
         }
         ipv6 = {
           enabled = false
@@ -317,7 +314,7 @@ resource "helm_release" "calico" {
   count            = var.install_calico ? 1 : 0
   depends_on       = [local_sensitive_file.kube_cluster_yaml, rke_cluster.cluster]
   name             = "calico"
-  repository       = "https://projectcalico.docs.tigera.io/charts"
+  repository       = "https://docs.tigera.io/calico/charts"
   chart            = "tigera-operator"
   version          = local.calico_version
   namespace        = "tigera-operator"
@@ -405,7 +402,7 @@ resource "null_resource" "node_cleanup" {
   provisioner "remote-exec" {
     when = destroy
     inline = [
-      "chmod +x /tmp/cleanup.bash && /tmp/cleanup.bash -f -i", "(sleep 5;reboot) &"
+      "chmod +x /tmp/cleanup.bash && /tmp/cleanup.bash -f -i", "shutdown -r"
     ]
   }
 }

local.tf

@@ -38,7 +38,7 @@ locals {
   sans            = compact(concat(var.sans, var.api_server_lb))
   # versions
   cilium_version         = "1.12.5"
-  calico_version         = "3.24.1"
+  calico_version         = "3.25.0"
   metrics_server_version = "3.8.3"
   argocd_version         = "5.5.24"
   kubernetes_version     = var.kubernetes_version != "" ? var.kubernetes_version : local.rke_version

vars.tf

@@ -29,7 +29,7 @@ variable "cilium_debug" {
 }
 variable "cilium_ipam" {
   description = "IPAM method to use for kubernetes cluster"
-  default     = "cluster-pool"
+  default     = "kubernetes"
 }
 variable "cilium_monitor" {
   description = "This option enables coalescing of tracing events"