Skip to content

Commit 93e7c21

Browse files
Added changes for nginx and cluster auto scalar chart version to support for kube version v1.26 (#10)
* update changes for nginx and cluster autoscalar, kubecost and add the compatibility matrix for EKS-v1.26
1 parent abf914b commit 93e7c21

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

EKS-Blueprint/modules/kubernetes-addons/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ module "calico" {
657657
module "kubecost" {
658658
source = "./kubecost"
659659

660-
count = var.enable_kubecost ? 1 : 0
660+
count = var.kubecost_enabled ? 1 : 0
661661

662662
helm_config = var.kubecost_helm_config
663663
manage_via_gitops = var.argocd_manage_add_ons

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module "eks_bootstrap" {
2626
kubeclarity_enabled = false
2727
kubeclarity_hostname = ""
2828
kubecost_enabled = false
29+
kubecost_hostname = ""
2930
cert_manager_enabled = true
3031
worker_iam_role_name = "worker_iam_role_name"
3132
ingress_nginx_enabled = true
@@ -65,11 +66,14 @@ module "eks_bootstrap" {
6566

6667
## Compatibility
6768

68-
| Release | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 |
69-
|------------------|------------------|------------------|----------------------|
70-
| Release 1.0.0 | ✔ | ✗ | ✗ |
71-
| Release 1.0.1 | ✔ | ✔ | ✔ |
72-
| Release 1.1.0 | ✔ | ✔ | ✔ |
69+
| Release | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 |
70+
|------------------|------------------|------------------|----------------------|----------------------|
71+
| Release 1.0.0 | ✔ | ✗ | ✗ | ✗ |
72+
| Release 1.0.1 | ✔ | ✔ | ✔ | ✗ |
73+
| Release 1.1.0 | ✔ | ✔ | ✔ | ✗ |
74+
| Release 2.0.0 | ✔ | ✔ | ✔ | ✗ |
75+
| Release 2.1.0 | ✔ | ✔ | ✔ | ✗ |
76+
| Release 3.0.0 | ✔ | ✔ | ✔ | ✔ |
7377

7478
## IAM Permissions
7579
The required IAM permissions to create resources from this module can be found [here](https://github.com/squareops/terraform-aws-eks-bootstrap/blob/main/IAM.md)

main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ resource "helm_release" "internal_nginx" {
221221
count = var.internal_ingress_nginx_enabled ? 1 : 0
222222
name = "internal-ingress-nginx"
223223
chart = "ingress-nginx"
224-
version = "4.1.4"
224+
version = "4.7.0"
225225
namespace = "internal-ingress-nginx"
226226
repository = "https://kubernetes.github.io/ingress-nginx"
227227
values = [
@@ -253,6 +253,7 @@ resource "random_password" "kube_clarity" {
253253
}
254254

255255
resource "kubernetes_secret" "kube_clarity" {
256+
count = var.kubeclarity_enabled ? 1 : 0
256257
depends_on = [kubernetes_namespace.kube_clarity]
257258
metadata {
258259
name = "basic-auth"
@@ -307,6 +308,7 @@ resource "random_password" "kubecost" {
307308
}
308309

309310
resource "kubernetes_secret" "kubecost" {
311+
count = var.kubecost_enabled ? 1 : 0
310312
depends_on = [aws_eks_addon.kubecost]
311313
metadata {
312314
name = "basic-auth"

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variable "cluster_autoscaler_enabled" {
2525

2626
variable "cluster_autoscaler_chart_version" {
2727
description = "Version of the cluster autoscaler helm chart"
28-
default = "9.19.1"
28+
default = "9.29.0"
2929
type = string
3030
}
3131

@@ -109,7 +109,7 @@ variable "aws_load_balancer_version" {
109109

110110
variable "ingress_nginx_version" {
111111
description = "Specify the version of the NGINX Ingress Controller"
112-
default = "4.1.4"
112+
default = "4.7.0"
113113
type = string
114114
}
115115

0 commit comments

Comments
 (0)