fix: updated enabled applications in k8s-addons

maddevsio · Dec 26, 2024 · be12707 · be12707
1 parent 3fa0e62
commit be12707
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 79 deletions.
diff --git 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",
@@ -437,7 +438,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}"
@@ -450,6 +450,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/eks-loki-stack.tf b/terraform/modules/k8s-addons/eks-loki-stack.tf
@@ -10,6 +10,9 @@ locals {
   loki_stack_values = <<VALUES
 loki:
   enabled: true
+  image:
+    repository: grafana/loki
+    tag: 2.9.11
   rbac:
     create: true
     pspEnabled: false # Due to psp removed in k8s 1.25 and latest loki-stack chart doesn't maintain new PSP version

diff --git 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,7 +75,7 @@ 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
@@ -87,7 +87,7 @@ releases:
     enabled: true
     chart: reloader
     repository: https://stakater.github.io/stakater-charts
-    chart_version: 1.0.97
+    chart_version: 1.2.0
     namespace: reloader
   - id: victoria-metrics-k8s-stack
     enabled: false

diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl
@@ -72,7 +72,7 @@ terraform {
       version = "${include.root.locals.tf_providers.kubernetes}"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
+      source  = "alekc/kubectl"
       version = "${include.root.locals.tf_providers.kubectl}"
     }
     helm = {