[addons/kubernetes-dashboard] remove fixed service account

modules/kubernetes-addons/kubernetes-dashboard/README.md

@@ -12,13 +12,13 @@ This add-on bootstraps the Kubernetes Dashboard on the EKS cluster using a [helm
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
+| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | >= 1.14 |
+| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.10 |
 
 ## Modules
 
@@ -30,7 +30,7 @@ This add-on bootstraps the Kubernetes Dashboard on the EKS cluster using a [helm
 
 | Name | Type |
 |------|------|
-| [kubectl_manifest.sa_config](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
+| [kubernetes_namespace_v1.this](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace_v1) | resource |
 
 ## Inputs
 

modules/kubernetes-addons/kubernetes-dashboard/locals.tf

@@ -1,16 +1,14 @@
 locals {
-  name                 = "kubernetes-dashboard"
-  service_account_name = "eks-admin"
-  namespace            = "kube-system"
+  name = "kubernetes-dashboard"
 
   default_helm_config = {
     name        = local.name
     chart       = local.name
     repository  = "https://kubernetes.github.io/dashboard/"
-    version     = "5.2.0"
-    namespace   = local.namespace
+    version     = "5.4.1"
+    namespace   = local.name
     description = "Kubernetes Dashboard Helm Chart"
-    values      = local.default_helm_values
+    values      = []
     timeout     = "1200"
   }
 
@@ -19,28 +17,7 @@ locals {
     var.helm_config
   )
 
-  default_helm_values = []
-
-  set_values = [
-    {
-      name  = "serviceAccount.name"
-      value = local.service_account_name
-    },
-    {
-      name  = "serviceAccount.create"
-      value = false
-    }
-  ]
-
-  irsa_config = {
-    kubernetes_namespace              = local.helm_config["namespace"]
-    kubernetes_service_account        = local.service_account_name
-    create_kubernetes_namespace       = false
-    create_kubernetes_service_account = true
-  }
-
   argocd_gitops_config = {
-    enable             = true
-    serviceAccountName = local.service_account_name
+    enable = true
   }
 }

modules/kubernetes-addons/kubernetes-dashboard/main.tf

@@ -1,17 +1,20 @@
 module "helm_addon" {
   source            = "../helm-addon"
   manage_via_gitops = var.manage_via_gitops
-  set_values        = local.set_values
   helm_config       = local.helm_config
-  irsa_config       = local.irsa_config
+  irsa_config       = null
   addon_context     = var.addon_context
+
+  depends_on = [kubernetes_namespace_v1.this]
 }
 
-resource "kubectl_manifest" "sa_config" {
-  yaml_body = templatefile("${path.module}/manifests/eks-admin-service-account.yaml", {
-    sa-name   = local.service_account_name
-    namespace = local.helm_config["namespace"]
-  })
-
-  depends_on = [module.helm_addon]
+resource "kubernetes_namespace_v1" "this" {
+  count = local.helm_config["namespace"] == "kube-system" ? 0 : 1
+
+  metadata {
+    name = local.helm_config["namespace"]
+    labels = {
+      "app.kubernetes.io/managed-by" = "terraform-aws-eks-blueprints"
+    }
+  }
 }

modules/kubernetes-addons/kubernetes-dashboard/versions.tf

@@ -2,9 +2,9 @@ terraform {
   required_version = ">= 1.0.0"
 
   required_providers {
-    kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = ">= 1.14"
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = ">= 2.10"
     }
   }
 }