From 28f09253c74fece4501c07881fef7c33e8fa5f0a Mon Sep 17 00:00:00 2001
From: Lucas Telles <lucas.telles@indicodata.ai>
Date: Thu, 7 Nov 2024 19:49:42 -0300
Subject: [PATCH] [DOP-2367] Update k8s version to 1.31 (#344)

* [DOP-2367] Update default k8s version to 1.31

* [DOP-2367] Update guardduty addon

* [DOP-2367] Set default storageclass for aws-ebs-csi-driver

* [DOP-2367] Set default annotation for gp2 storageclass

* [DOP-2367] Change resource name

* [DOP-2367] Fix syntax
---
 aws_specific_modules.tf     |  2 +-
 azure/user_vars.auto.tfvars |  2 +-
 azure/variables.tf          |  2 +-
 ipa.tf                      | 15 +++++++++++++++
 user_vars.auto.tfvars       |  2 +-
 variables.tf                |  2 +-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/aws_specific_modules.tf b/aws_specific_modules.tf
index 6c491ab5..571c499c 100644
--- a/aws_specific_modules.tf
+++ b/aws_specific_modules.tf
@@ -114,7 +114,7 @@ resource "aws_eks_addon" "guardduty" {
 
   cluster_name      = var.label
   addon_name        = "aws-guardduty-agent"
-  addon_version     = "v1.5.0-eksbuild.1"
+  addon_version     = "v1.7.1-eksbuild.1"
   resolve_conflicts = "OVERWRITE"
 
   preserve = true
diff --git a/azure/user_vars.auto.tfvars b/azure/user_vars.auto.tfvars
index e1b2a720..02a14d42 100644
--- a/azure/user_vars.auto.tfvars
+++ b/azure/user_vars.auto.tfvars
@@ -8,7 +8,7 @@ vnet_cidr               = "192.168.0.0/20"
 subnet_cidrs            = ["192.168.0.0/22"]
 storage_account_name    = ""
 private_cluster_enabled = false
-k8s_version             = "1.29"
+k8s_version             = "1.31"
 
 default_node_pool = {
   name       = "defaultpool"
diff --git a/azure/variables.tf b/azure/variables.tf
index 6fe1a6ac..9f740a2c 100644
--- a/azure/variables.tf
+++ b/azure/variables.tf
@@ -206,7 +206,7 @@ variable "svp_client_secret" {
 
 variable "k8s_version" {
   type        = string
-  default     = "1.29"
+  default     = "1.31"
   description = "The version of the kubernetes cluster"
 }
 
diff --git a/ipa.tf b/ipa.tf
index f0a9c421..9034648b 100644
--- a/ipa.tf
+++ b/ipa.tf
@@ -587,6 +587,21 @@ EOT
   ]
 }
 
+resource "kubectl_manifest" "gp2-storageclass" {
+  yaml_body = <<YAML
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: gp2
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+parameters:
+  fsType: ext4
+  type: gp2
+provisioner: kubernetes.io/aws-ebs
+volumeBindingMode: WaitForFirstConsumer
+YAML
+}
 
 resource "time_sleep" "wait_1_minutes_after_crds" {
   depends_on = [helm_release.ipa-crds]
diff --git a/user_vars.auto.tfvars b/user_vars.auto.tfvars
index dd227153..97e6756b 100644
--- a/user_vars.auto.tfvars
+++ b/user_vars.auto.tfvars
@@ -11,7 +11,7 @@ ipa_values = ""
 #name                 = "dop-832"
 #cluster_name         = "dop-832"
 #label                = "dop-832" # will be used for resource naming. should be unique within the AWS account
-k8s_version = "1.29"
+k8s_version = "1.31"
 node_groups = {
   gpu-workers = {
     min_size               = 0
diff --git a/variables.tf b/variables.tf
index 1021c7a7..51aa1f44 100644
--- a/variables.tf
+++ b/variables.tf
@@ -192,7 +192,7 @@ variable "cluster_name" {
 
 variable "k8s_version" {
   type        = string
-  default     = "1.29"
+  default     = "1.31"
   description = "The EKS version to use"
 }