Skip to content

Commit

Permalink
Added changes for nginx and cluster auto scalar chart version to supp…
Browse files Browse the repository at this point in the history
…ort for kube version v1.26 (#10)

* update changes for nginx and cluster autoscalar, kubecost and add the compatibility matrix for EKS-v1.26
  • Loading branch information
yuvraj-squareops authored Jun 30, 2023
1 parent abf914b commit 93e7c21
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion EKS-Blueprint/modules/kubernetes-addons/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ module "calico" {
module "kubecost" {
source = "./kubecost"

count = var.enable_kubecost ? 1 : 0
count = var.kubecost_enabled ? 1 : 0

helm_config = var.kubecost_helm_config
manage_via_gitops = var.argocd_manage_add_ons
Expand Down
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module "eks_bootstrap" {
kubeclarity_enabled = false
kubeclarity_hostname = ""
kubecost_enabled = false
kubecost_hostname = ""
cert_manager_enabled = true
worker_iam_role_name = "worker_iam_role_name"
ingress_nginx_enabled = true
Expand Down Expand Up @@ -65,11 +66,14 @@ module "eks_bootstrap" {

## Compatibility

| Release | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 |
|------------------|------------------|------------------|----------------------|
| Release 1.0.0 | ✔ | ✗ | ✗ |
| Release 1.0.1 | ✔ | ✔ | ✔ |
| Release 1.1.0 | ✔ | ✔ | ✔ |
| Release | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 |
|------------------|------------------|------------------|----------------------|----------------------|
| Release 1.0.0 | ✔ | ✗ | ✗ | ✗ |
| Release 1.0.1 | ✔ | ✔ | ✔ | ✗ |
| Release 1.1.0 | ✔ | ✔ | ✔ | ✗ |
| Release 2.0.0 | ✔ | ✔ | ✔ | ✗ |
| Release 2.1.0 | ✔ | ✔ | ✔ | ✗ |
| Release 3.0.0 | ✔ | ✔ | ✔ | ✔ |

## IAM Permissions
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)
Expand Down
4 changes: 3 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ resource "helm_release" "internal_nginx" {
count = var.internal_ingress_nginx_enabled ? 1 : 0
name = "internal-ingress-nginx"
chart = "ingress-nginx"
version = "4.1.4"
version = "4.7.0"
namespace = "internal-ingress-nginx"
repository = "https://kubernetes.github.io/ingress-nginx"
values = [
Expand Down Expand Up @@ -253,6 +253,7 @@ resource "random_password" "kube_clarity" {
}

resource "kubernetes_secret" "kube_clarity" {
count = var.kubeclarity_enabled ? 1 : 0
depends_on = [kubernetes_namespace.kube_clarity]
metadata {
name = "basic-auth"
Expand Down Expand Up @@ -307,6 +308,7 @@ resource "random_password" "kubecost" {
}

resource "kubernetes_secret" "kubecost" {
count = var.kubecost_enabled ? 1 : 0
depends_on = [aws_eks_addon.kubecost]
metadata {
name = "basic-auth"
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ variable "cluster_autoscaler_enabled" {

variable "cluster_autoscaler_chart_version" {
description = "Version of the cluster autoscaler helm chart"
default = "9.19.1"
default = "9.29.0"
type = string
}

Expand Down Expand Up @@ -109,7 +109,7 @@ variable "aws_load_balancer_version" {

variable "ingress_nginx_version" {
description = "Specify the version of the NGINX Ingress Controller"
default = "4.1.4"
default = "4.7.0"
type = string
}

Expand Down

0 comments on commit 93e7c21

Please sign in to comment.