Ensure namespace is passed correctly to IRSA

Some of the modules use the IRSA module, but don't create the namespace via that module. They need to pass the value set in the helm_config, so as to ensure both ServiceAccount and Helm chart are created in the same namespace.
aws-ia · Jun 9, 2022 · 6ff42ee · 6ff42ee
1 parent bfc714d
commit 6ff42ee
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/modules/kubernetes-addons/adot-collector-haproxy/locals.tf b/modules/kubernetes-addons/adot-collector-haproxy/locals.tf
@@ -51,7 +51,7 @@ locals {
   ]
 
   adot_collector_irsa_config = {
-    kubernetes_namespace              = local.name
+    kubernetes_namespace              = local.helm_config["namespace"]
     create_kubernetes_namespace       = false
     kubernetes_service_account        = local.adot_collector_service_account
     create_kubernetes_service_account = true

diff --git a/modules/kubernetes-addons/adot-collector-java/locals.tf b/modules/kubernetes-addons/adot-collector-java/locals.tf
@@ -51,7 +51,7 @@ locals {
   ]
 
   adot_collector_irsa_config = {
-    kubernetes_namespace              = local.name
+    kubernetes_namespace              = local.helm_config["namespace"]
     create_kubernetes_namespace       = false
     kubernetes_service_account        = local.adot_collector_service_account
     create_kubernetes_service_account = true

diff --git a/modules/kubernetes-addons/adot-collector-memcached/locals.tf b/modules/kubernetes-addons/adot-collector-memcached/locals.tf
@@ -51,7 +51,7 @@ locals {
   ]
 
   adot_collector_irsa_config = {
-    kubernetes_namespace              = local.name
+    kubernetes_namespace              = local.helm_config["namespace"]
     create_kubernetes_namespace       = false
     kubernetes_service_account        = local.adot_collector_service_account
     create_kubernetes_service_account = true

diff --git a/modules/kubernetes-addons/adot-collector-nginx/locals.tf b/modules/kubernetes-addons/adot-collector-nginx/locals.tf
@@ -51,7 +51,7 @@ locals {
   ]
 
   adot_collector_irsa_config = {
-    kubernetes_namespace              = local.name
+    kubernetes_namespace              = local.helm_config["namespace"]
     create_kubernetes_namespace       = false
     kubernetes_service_account        = local.adot_collector_service_account
     create_kubernetes_service_account = true

diff --git a/modules/kubernetes-addons/aws-efs-csi-driver/locals.tf b/modules/kubernetes-addons/aws-efs-csi-driver/locals.tf
@@ -41,7 +41,7 @@ locals {
   ]
 
   irsa_config = {
-    kubernetes_namespace              = local.namespace
+    kubernetes_namespace              = local.helm_config["namespace"]
     kubernetes_service_account        = local.service_account_name
     create_kubernetes_namespace       = false
     create_kubernetes_service_account = true