Skip to content

Commit 04ef1a9

Browse files
authored
RB-92 support EKS 1.32 and drop the 1.28 support (#63)
1 parent 601e007 commit 04ef1a9

File tree

5 files changed

+35
-17
lines changed

5 files changed

+35
-17
lines changed

aws/cluster/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
| [kubectl_manifest.ebs_storage_classes](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
4747
| [kubernetes_annotations.set_default_storage_class](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/annotations) | resource |
4848
| [kubernetes_annotations.unset_eks_default_gp2](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/annotations) | resource |
49+
| [kubernetes_annotations.unset_eks_default_gp3](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/annotations) | resource |
4950

5051
## Inputs
5152

@@ -58,12 +59,12 @@
5859
| <a name="input_AWS_SESSION_TOKEN"></a> [AWS\_SESSION\_TOKEN](#input\_AWS\_SESSION\_TOKEN) | Session token for temporary security credentials from AWS STS | `string` | `""` | no |
5960
| <a name="input_common_tags"></a> [common\_tags](#input\_common\_tags) | Common tags associated to resources created | `map(string)` | <pre>{<br/> "Environment": "dev",<br/> "Project": "radar-base"<br/>}</pre> | no |
6061
| <a name="input_create_dmz_node_group"></a> [create\_dmz\_node\_group](#input\_create\_dmz\_node\_group) | Whether or not to create a DMZ node group with taints | `bool` | `false` | no |
61-
| <a name="input_default_storage_class"></a> [default\_storage\_class](#input\_default\_storage\_class) | Default storage class used for describing the EBS usage | `string` | `"radar-base-ebs-sc-gp2"` | no |
62+
| <a name="input_default_storage_class"></a> [default\_storage\_class](#input\_default\_storage\_class) | Default storage class used for describing the EBS usage | `string` | `"radar-base-ebs-sc-gp3"` | no |
6263
| <a name="input_dmz_node_size"></a> [dmz\_node\_size](#input\_dmz\_node\_size) | Node size of the DMZ node group | `map(number)` | <pre>{<br/> "desired": 1,<br/> "max": 2,<br/> "min": 0<br/>}</pre> | no |
6364
| <a name="input_ecr_repository_names"></a> [ecr\_repository\_names](#input\_ecr\_repository\_names) | Default prefixes for ECR repositories if used for hosting the images | `list(string)` | <pre>[<br/> "radar-base-ecr-public",<br/> "radar-base-k8s",<br/> "radar-base-quay",<br/> "radar-base-docker-hub",<br/> "radar-base-ghcr"<br/>]</pre> | no |
6465
| <a name="input_eks_admins_group_users"></a> [eks\_admins\_group\_users](#input\_eks\_admins\_group\_users) | EKS admin IAM user group | `list(string)` | `[]` | no |
6566
| <a name="input_eks_cluster_name"></a> [eks\_cluster\_name](#input\_eks\_cluster\_name) | EKS cluster name | `string` | n/a | yes |
66-
| <a name="input_eks_kubernetes_version"></a> [eks\_kubernetes\_version](#input\_eks\_kubernetes\_version) | Amazon EKS Kubernetes version | `string` | `"1.31"` | no |
67+
| <a name="input_eks_kubernetes_version"></a> [eks\_kubernetes\_version](#input\_eks\_kubernetes\_version) | Amazon EKS Kubernetes version | `string` | `"1.32"` | no |
6768
| <a name="input_instance_capacity_type"></a> [instance\_capacity\_type](#input\_instance\_capacity\_type) | Capacity type used by EKS managed node groups | `string` | `"SPOT"` | no |
6869
| <a name="input_instance_types"></a> [instance\_types](#input\_instance\_types) | List of instance types used by EKS managed node groups | `list(any)` | <pre>[<br/> "m5.large",<br/> "m5d.large",<br/> "m5a.large",<br/> "m5ad.large",<br/> "m4.large"<br/>]</pre> | no |
6970
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | VPC CIDR | `string` | `"10.0.0.0/16"` | no |

aws/cluster/data.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
locals {
22

33
eks_core_versions = {
4+
"1.32" : {
5+
"cluster_version" = "1.32"
6+
"cluster_addons" = {
7+
"coredns" = "v1.11.4-eksbuild.14"
8+
"kube_proxy" = "v1.32.0-eksbuild.2"
9+
"vpc_cni" = "v1.19.2-eksbuild.1"
10+
"ebs_csi_driver" = "v1.37.0-eksbuild.2"
11+
}
12+
},
413
"1.31" : {
514
"cluster_version" = "1.31"
615
"cluster_addons" = {
@@ -28,15 +37,6 @@ locals {
2837
"ebs_csi_driver" = "v1.37.0-eksbuild.1"
2938
}
3039
},
31-
"1.28" : {
32-
"cluster_version" = "1.28"
33-
"cluster_addons" = {
34-
"coredns" = "v1.10.1-eksbuild.15"
35-
"kube_proxy" = "v1.28.15-eksbuild.4"
36-
"vpc_cni" = "v1.19.0-eksbuild.1"
37-
"ebs_csi_driver" = "v1.37.0-eksbuild.1"
38-
}
39-
},
4040
}
4141

4242
storage_classes = {

aws/cluster/ebs.tf

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,23 @@ resource "kubernetes_annotations" "unset_eks_default_gp2" {
3737
]
3838
}
3939

40+
resource "kubernetes_annotations" "unset_eks_default_gp3" {
41+
api_version = "storage.k8s.io/v1"
42+
kind = "StorageClass"
43+
force = "true"
44+
45+
metadata {
46+
name = "gp3"
47+
}
48+
annotations = {
49+
"storageclass.kubernetes.io/is-default-class" = "false"
50+
}
51+
52+
depends_on = [
53+
module.eks
54+
]
55+
}
56+
4057
resource "kubernetes_annotations" "set_default_storage_class" {
4158
api_version = "storage.k8s.io/v1"
4259
kind = "StorageClass"

aws/cluster/terraform.tfvars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AWS_REGION = "eu-west-2"
2-
eks_kubernetes_version = "1.29"
2+
eks_kubernetes_version = "1.32"
33
eks_admins_group_users = []
4-
default_storage_class = "radar-base-ebs-sc-gp2"
4+
default_storage_class = "radar-base-ebs-sc-gp3"
55
create_dmz_node_group = false

aws/cluster/variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ variable "common_tags" {
5353
variable "eks_kubernetes_version" {
5454
type = string
5555
description = "Amazon EKS Kubernetes version"
56-
default = "1.31"
56+
default = "1.32"
5757

5858
validation {
59-
condition = contains(["1.31", "1.30", "1.29", "1.28"], var.eks_kubernetes_version)
60-
error_message = "Invalid EKS Kubernetes version. Supported versions are '1.31', '1.30', '1.29', '1.28'."
59+
condition = contains(["1.32", "1.31", "1.30", "1.29"], var.eks_kubernetes_version)
60+
error_message = "Invalid EKS Kubernetes version. Supported versions are '1.32', '1.31', '1.30', '1.29'."
6161
}
6262
}
6363

@@ -139,7 +139,7 @@ variable "vpc_public_subnet_cidr" {
139139
variable "default_storage_class" {
140140
type = string
141141
description = "Default storage class used for describing the EBS usage"
142-
default = "radar-base-ebs-sc-gp2"
142+
default = "radar-base-ebs-sc-gp3"
143143

144144
validation {
145145
condition = var.default_storage_class == "radar-base-ebs-sc-gp2" || var.default_storage_class == "radar-base-ebs-sc-gp3" || var.default_storage_class == "radar-base-ebs-sc-io1" || var.default_storage_class == "radar-base-ebs-sc-io2"

0 commit comments

Comments
 (0)