Merge pull request #457 from mojaloop/feat/k8s-upgrade

k8s version updates
mojaloop · Jan 27, 2025 · bbf7ca2 · bbf7ca2
2 parents 137f08b + 9641b86
commit bbf7ca2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/terraform/aws/eks/infra.tf b/terraform/aws/eks/infra.tf
@@ -294,7 +294,7 @@ data "aws_ami" "eks_default" {
 
   filter {
     name   = "name"
-    values = ["amazon-eks-node-${var.kubernetes_version}-v20241106"] # putting exact name for avoiding accidental ami change - until the long term fix
+    values = ["amazon-eks-node-${var.kubernetes_version}-${var.eks_node_ami_version}"]
   }
 }
 

diff --git a/terraform/aws/eks/variables.tf b/terraform/aws/eks/variables.tf
@@ -15,8 +15,15 @@ variable "domain" {
 variable "kubernetes_version" {
   description = "version of k8s"
   type        = string
-  default     = "1.30"
+  default     = "1.31"
 }
+
+variable "eks_node_ami_version" {
+  description = "version of eks ami"
+  type        = string
+  default     = "v20241225"
+}
+
 variable "ext_interop_switch_subdomain" {
   description = "subdomain for interop ext"
   default     = "ext"

diff --git a/terraform/ccnew/ansible-k8s-deploy/terragrunt.hcl b/terraform/ccnew/ansible-k8s-deploy/terragrunt.hcl
@@ -76,7 +76,7 @@ inputs = {
    coredns_localcache_version = local.common_vars.coredns_localcache_version},
   (local.K8S_CLUSTER_TYPE == "microk8s") ? {
     microk8s_dns_resolvers = try(dependency.k8s_deploy.outputs.all_hosts_var_maps.dns_resolver_ip, "")
-    microk8s_version       = try(local.env_vars.microk8s_version, "1.30/stable")
+    microk8s_version       = try(local.env_vars.microk8s_version, "1.31/stable")
     microk8s_dev_skip      = try(local.env_vars.microk8s_dev_skip, false)
     kubernetes_oidc_enabled = try(local.env_vars.kubernetes_oidc_enabled, false)
     enable_rook_disk_reset = true

diff --git a/terraform/ccnew/default-config/common-vars.yaml b/terraform/ccnew/default-config/common-vars.yaml
@@ -1,5 +1,5 @@
 tf_version: ">= 1.2"
-microk8s_version: 1.30/stable
+microk8s_version: 1.31/stable
 local_tf_provider_version: "~> 2.4"
 gitlab_tf_provider_version: "~> 16.0"
 vault_tf_provider_version: "~> 3.16"
@@ -33,8 +33,8 @@ aws_crossplane_module_version: "0.49.2"
 crossplane_func_pat_version: "0.2.1"
 k8s_crossplane_module_version: "0.11.4"
 crossplane_func_go_templating_version: "0.8.0"
-velero_helm_version: "7.2.1"
-velero_plugin_version: "v1.10.1"
+velero_helm_version: "8.3.0"
+velero_plugin_version: "v1.11.1"
 coredns_localcache_version: "1.11.3"
 
 istio_egress_gateway_max_replicas: 5

diff --git a/terraform/k8s/ansible-k8s-deploy/terragrunt.hcl b/terraform/k8s/ansible-k8s-deploy/terragrunt.hcl
@@ -45,7 +45,7 @@ inputs = {
     registry_mirror_fqdn        = local.NEXUS_FQDN
   }, (local.K8S_CLUSTER_TYPE == "microk8s") ? {
     microk8s_dns_resolvers = try(dependency.k8s_deploy.outputs.all_hosts_var_maps.dns_resolver_ip, "")
-    microk8s_version       = try(local.common_vars.microk8s_version, "1.30/stable")
+    microk8s_version       = try(local.common_vars.microk8s_version, "1.31/stable")
   } : {})
   bastion_hosts_yaml_maps       = merge(dependency.k8s_deploy.outputs.bastion_hosts_yaml_maps, local.bastion_hosts_yaml_maps)
   master_hosts_yaml_maps        = dependency.k8s_deploy.outputs.master_hosts_yaml_maps

diff --git a/terraform/k8s/default-config/common-vars.yaml b/terraform/k8s/default-config/common-vars.yaml
@@ -42,7 +42,7 @@ loki_ingester_replica_count: "3" # loki_ingester_replica_count should be >= loki
 prometheus_retention_period: 10d
 tempo_retention_period: 72h
 istio_egress_gateway_max_replicas: 5
-microk8s_version: 1.30/stable
+microk8s_version: 1.31/stable
 alertmanager_enabled: false
 alertmanager_prod_alerts_enabled: false   # if false, alerts are sent to dev alerts slack channel
 alertmanager_slack_integration_enabled: false