Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOP-2367] Update k8s version to 1.31 #344

Merged
merged 6 commits into from
Nov 7, 2024
Merged

[DOP-2367] Update k8s version to 1.31 #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67ba7bc
[DOP-2367] Update default k8s version to 1.31
ltellesfl Nov 6, 2024
af45adc
[DOP-2367] Update guardduty addon
ltellesfl Nov 7, 2024
35d13b5
[DOP-2367] Set default storageclass for aws-ebs-csi-driver
ltellesfl Nov 7, 2024
4a322c3
[DOP-2367] Set default annotation for gp2 storageclass
ltellesfl Nov 7, 2024
20c7fff
[DOP-2367] Change resource name
ltellesfl Nov 7, 2024
56b624f
[DOP-2367] Fix syntax
ltellesfl Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws_specific_modules.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/user_vars.auto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion azure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
15 changes: 15 additions & 0 deletions ipa.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion user_vars.auto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ variable "cluster_name" {

variable "k8s_version" {
type = string
default = "1.29"
default = "1.31"
description = "The EKS version to use"
}

Expand Down