From 86c20347056c0d606902e5d50492f7c6495080be Mon Sep 17 00:00:00 2001
From: Valentin Khramtsov <valentin.kh@maddevs.io>
Date: Thu, 26 Dec 2024 13:17:16 +0300
Subject: [PATCH] update aws lb controller and ingress-nginx

---
 .../k8s-addons/eks-aws-loadbalancer-controller.tf    |  3 ++-
 terraform/modules/k8s-addons/helm-releases.yaml      | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf
index 191a128..e32c6d2 100644
--- a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf
+++ b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf
@@ -137,6 +137,7 @@ module "aws_iam_aws_loadbalancer_controller" {
           "elasticloadbalancing:DescribeLoadBalancerAttributes",
           "elasticloadbalancing:DescribeListeners",
           "elasticloadbalancing:DescribeListenerCertificates",
+          "elasticloadbalancing:DescribeListenerAttributes",
           "elasticloadbalancing:DescribeSSLPolicies",
           "elasticloadbalancing:DescribeRules",
           "elasticloadbalancing:DescribeTargetGroups",
@@ -441,7 +442,6 @@ resource "kubernetes_ingress_v1" "default" {
   metadata {
     name = "${local.ingress_nginx.name}-controller"
     annotations = {
-      "kubernetes.io/ingress.class"                        = "alb"
       "alb.ingress.kubernetes.io/scheme"                   = "internet-facing"
       "alb.ingress.kubernetes.io/tags"                     = "Environment=${local.env},Name=${local.name},Cluster=${local.eks_cluster_id}"
       "alb.ingress.kubernetes.io/certificate-arn"          = "${local.ssl_certificate_arn}"
@@ -454,6 +454,7 @@ resource "kubernetes_ingress_v1" "default" {
     namespace = module.ingress_nginx_namespace[count.index].name
   }
   spec {
+    ingress_class_name = "alb"
     rule {
       http {
         path {
diff --git a/terraform/modules/k8s-addons/helm-releases.yaml b/terraform/modules/k8s-addons/helm-releases.yaml
index 16710c9..899af41 100644
--- a/terraform/modules/k8s-addons/helm-releases.yaml
+++ b/terraform/modules/k8s-addons/helm-releases.yaml
@@ -3,7 +3,7 @@ releases:
     enabled: true
     chart: aws-load-balancer-controller
     repository: https://aws.github.io/eks-charts
-    chart_version: 1.7.2
+    chart_version: 1.11.0
     namespace: aws-load-balancer-controller
   - id: cert-manager
     enabled: false
@@ -39,7 +39,7 @@ releases:
     enabled: true
     chart: external-secrets
     repository: https://charts.external-secrets.io
-    chart_version: 0.10.0
+    chart_version: 0.11.0
     namespace: external-secrets
   - id: gitlab-runner
     enabled: false
@@ -51,7 +51,7 @@ releases:
     enabled: true
     chart: ingress-nginx
     repository: https://kubernetes.github.io/ingress-nginx
-    chart_version: 4.10.1
+    chart_version: 4.11.3
     namespace: ingress-nginx
   - id: istio
     enabled: false
@@ -75,16 +75,16 @@ releases:
     enabled: true
     chart: kube-prometheus-stack
     repository: https://prometheus-community.github.io/helm-charts
-    chart_version: 61.3.1
+    chart_version: 67.3.1
     namespace: monitoring
   - id: loki-stack
-    enabled: true
+    enabled: false
     chart: loki-stack
     repository: https://grafana.github.io/helm-charts
     chart_version: 2.10.2
     namespace: loki
   - id: reloader
-    enabled: true
+    enabled: false
     chart: reloader
     repository: https://stakater.github.io/stakater-charts
     chart_version: 1.0.97