From 2c2b1e64a2132747ff5e5d7fa5a26691205f5bd3 Mon Sep 17 00:00:00 2001
From: hmuthusamy <hmmuthus@amazon.com>
Date: Sat, 14 Sep 2024 10:59:28 -0400
Subject: [PATCH] Issue#229 changing v1beta2 to v1 for flux

---
 modules/eks-monitoring/dashboards.tf          | 10 +++++-----
 modules/eks-monitoring/patterns/istio/main.tf |  2 +-
 modules/eks-monitoring/patterns/java/main.tf  |  2 +-
 modules/eks-monitoring/patterns/nginx/main.tf |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/eks-monitoring/dashboards.tf b/modules/eks-monitoring/dashboards.tf
index d130e80d..80b98b5c 100644
--- a/modules/eks-monitoring/dashboards.tf
+++ b/modules/eks-monitoring/dashboards.tf
@@ -19,7 +19,7 @@ YAML
 
 resource "kubectl_manifest" "flux_kustomization" {
   yaml_body  = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${var.flux_kustomization_name}
@@ -50,7 +50,7 @@ YAML
 # api server dashboards
 resource "kubectl_manifest" "api_server_dashboards" {
   yaml_body  = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${local.apiserver_monitoring_config.flux_kustomization_name}
@@ -75,7 +75,7 @@ YAML
 # adot health dashboards
 resource "kubectl_manifest" "adothealth_monitoring_dashboards" {
   yaml_body  = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${local.adothealth_monitoring_config.flux_kustomization_name}
@@ -98,7 +98,7 @@ YAML
 # nvidia dashboards
 resource "kubectl_manifest" "nvidia_monitoring_dashboards" {
   yaml_body  = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${local.nvidia_monitoring_config.flux_kustomization_name}
@@ -117,7 +117,7 @@ YAML
 
 resource "kubectl_manifest" "kubeproxy_monitoring_dashboard" {
   yaml_body  = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${local.kubeproxy_monitoring_config.flux_kustomization_name}
diff --git a/modules/eks-monitoring/patterns/istio/main.tf b/modules/eks-monitoring/patterns/istio/main.tf
index 30f53045..f6cb0d10 100644
--- a/modules/eks-monitoring/patterns/istio/main.tf
+++ b/modules/eks-monitoring/patterns/istio/main.tf
@@ -192,7 +192,7 @@ resource "kubectl_manifest" "flux_kustomization" {
   count = var.pattern_config.enable_dashboards ? 1 : 0
 
   yaml_body = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${var.pattern_config.flux_kustomization_name}
diff --git a/modules/eks-monitoring/patterns/java/main.tf b/modules/eks-monitoring/patterns/java/main.tf
index a28ff6c0..f5f91dd9 100644
--- a/modules/eks-monitoring/patterns/java/main.tf
+++ b/modules/eks-monitoring/patterns/java/main.tf
@@ -36,7 +36,7 @@ resource "kubectl_manifest" "flux_kustomization" {
   count = var.pattern_config.enable_dashboards ? 1 : 0
 
   yaml_body = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${var.pattern_config.flux_kustomization_name}
diff --git a/modules/eks-monitoring/patterns/nginx/main.tf b/modules/eks-monitoring/patterns/nginx/main.tf
index 3407e1b2..c44f46e8 100644
--- a/modules/eks-monitoring/patterns/nginx/main.tf
+++ b/modules/eks-monitoring/patterns/nginx/main.tf
@@ -42,7 +42,7 @@ resource "kubectl_manifest" "flux_kustomization" {
   count = var.pattern_config.enable_dashboards ? 1 : 0
 
   yaml_body = <<YAML
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ${var.pattern_config.flux_kustomization_name}