Fix set_sensitive values in helm-addon (#370)

examples/argocd/README.md → examples/gitops/argocd/README.md

@@ -20,9 +20,9 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_aws-eks-accelerator-for-terraform"></a> [aws-eks-accelerator-for-terraform](#module\_aws-eks-accelerator-for-terraform) | ../.. | n/a |
+| <a name="module_aws-eks-accelerator-for-terraform"></a> [aws-eks-accelerator-for-terraform](#module\_aws-eks-accelerator-for-terraform) | ../../../ | n/a |
 | <a name="module_aws_vpc"></a> [aws\_vpc](#module\_aws\_vpc) | terraform-aws-modules/vpc/aws | v3.2.0 |
-| <a name="module_kubernetes-addons"></a> [kubernetes-addons](#module\_kubernetes-addons) | ../../modules/kubernetes-addons | n/a |
+| <a name="module_kubernetes-addons"></a> [kubernetes-addons](#module\_kubernetes-addons) | ../../../modules/kubernetes-addons | n/a |
 
 ## Resources
 

examples/argocd/main.tf → examples/gitops/argocd/main.tf

@@ -126,7 +126,7 @@ module "aws_vpc" {
 #---------------------------------------------------------------
 
 module "aws-eks-accelerator-for-terraform" {
-  source = "../.."
+  source = "../../../"
 
   tenant            = local.tenant
   environment       = local.environment
@@ -155,7 +155,7 @@ module "aws-eks-accelerator-for-terraform" {
 }
 
 module "kubernetes-addons" {
-  source = "../../modules/kubernetes-addons"
+  source = "../../../modules/kubernetes-addons"
 
   eks_cluster_id = module.aws-eks-accelerator-for-terraform.eks_cluster_id
 

modules/kubernetes-addons/argocd/locals.tf

-
 locals {
   default_helm_values = [templatefile("${path.module}/values.yaml", {})]
 
   # Admin Password
-  default_helm_set_sensitive = var.admin_password_secret_name != "" ? [
+  set_sensitive = var.admin_password_secret_name != "" ? [
     {
       name  = "configs.secret.argocdServerAdminPassword"
       value = data.aws_secretsmanager_secret_version.admin_password_version[0].secret_string
@@ -21,9 +20,8 @@ locals {
     namespace        = local.namespace
     timeout          = "1200"
     create_namespace = true
-    set_sensitive    = local.default_helm_set_sensitive
     values           = local.default_helm_values
-    description      = "The argocd HelmChart Ingress Controller deployment configuration"
+    description      = "The ArgoCD Helm Chart deployment configuration"
   }
 
   helm_config = merge(

modules/kubernetes-addons/argocd/main.tf

 module "helm_addon" {
-  source        = "../helm-addon"
-  helm_config   = local.helm_config
-  irsa_config   = null
-  addon_context = var.addon_context
+  source               = "../helm-addon"
+  helm_config          = local.helm_config
+  irsa_config          = null
+  set_sensitive_values = local.set_sensitive
+  addon_context        = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
 }

modules/kubernetes-addons/helm-addon/main.tf

@@ -48,7 +48,7 @@ resource "helm_release" "addon" {
 
   dynamic "set_sensitive" {
     iterator = each_item
-    for_each = try(var.helm_config["set_sensitive"], null) != null ? distinct(concat(var.set_sensitive_values, var.helm_config["set_sensitive"])) : var.set_sensitive_values
+    for_each = try(var.helm_config["set_sensitive"], null) != null ? concat(var.helm_config["set_sensitive"], var.set_sensitive_values) : var.set_sensitive_values
 
     content {
       name  = each_item.value.name