From 35d131775b0c2f9235fa880bf171e935b8b50ce3 Mon Sep 17 00:00:00 2001
From: Abdul Rauf <abdulraufmujahid@gmail.com>
Date: Thu, 13 Apr 2023 16:42:53 +0500
Subject: [PATCH] feat: Upgrade modules for EKS 1.25 support (#1547)

---
 .../kubernetes-addons/aws-for-fluentbit/locals.tf  |  2 +-
 .../aws-for-fluentbit/values.yaml                  | 14 +-------------
 .../aws-node-termination-handler/locals.tf         |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/modules/kubernetes-addons/aws-for-fluentbit/locals.tf b/modules/kubernetes-addons/aws-for-fluentbit/locals.tf
index 97f05551a2..8dd285c55e 100644
--- a/modules/kubernetes-addons/aws-for-fluentbit/locals.tf
+++ b/modules/kubernetes-addons/aws-for-fluentbit/locals.tf
@@ -19,7 +19,7 @@ locals {
     name        = local.name
     chart       = local.name
     repository  = "https://aws.github.io/eks-charts"
-    version     = "0.1.21"
+    version     = "0.1.24"
     namespace   = local.name
     values      = local.default_helm_values
     description = "aws-for-fluentbit Helm Chart deployment configuration"
diff --git a/modules/kubernetes-addons/aws-for-fluentbit/values.yaml b/modules/kubernetes-addons/aws-for-fluentbit/values.yaml
index 8cbdc20761..8dda00c88f 100644
--- a/modules/kubernetes-addons/aws-for-fluentbit/values.yaml
+++ b/modules/kubernetes-addons/aws-for-fluentbit/values.yaml
@@ -2,19 +2,7 @@ serviceAccount:
   create: false
   name: ${service_account}
 
-cloudWatch:
+cloudWatchLogs:
   enabled: true
   region: ${aws_region}
   logGroupName: ${log_group_name}
-
-firehose:
-  enabled: false
-  region: ${aws_region}
-
-kinesis:
-  enabled: false
-  region: ${aws_region}
-
-elasticsearch:
-  enabled: false
-  region: ${aws_region}
diff --git a/modules/kubernetes-addons/aws-node-termination-handler/locals.tf b/modules/kubernetes-addons/aws-node-termination-handler/locals.tf
index 69ebeb5561..8e192811dc 100644
--- a/modules/kubernetes-addons/aws-node-termination-handler/locals.tf
+++ b/modules/kubernetes-addons/aws-node-termination-handler/locals.tf
@@ -8,7 +8,7 @@ locals {
     name        = local.name
     chart       = local.name
     repository  = "https://aws.github.io/eks-charts"
-    version     = "0.19.3"
+    version     = "0.21.0"
     namespace   = local.namespace
     description = "AWS Node Termination Handler Helm Chart"
     values      = local.default_helm_values