From c131b23df8227df5593f9a4b5d3472dd439f9d08 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 11 Mar 2025 18:18:04 -0400
Subject: [PATCH] fix merge issues

---
 main.tf      | 2 +-
 variables.tf | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/main.tf b/main.tf
index bca2130..638cfdc 100644
--- a/main.tf
+++ b/main.tf
@@ -11,7 +11,7 @@ module "karpenter_resources" {
   cluster_name                    = var.cluster_name
   enable_irsa                     = true
   irsa_oidc_provider_arn          = var.oidc_provider_arn
-  irsa_namespace_service_accounts = ["${local.namespace}:karpenter"]
+  irsa_namespace_service_accounts = ["${var.namespace}:karpenter"]
   create_pod_identity_association = true
   enable_v1_permissions           = true
   create_instance_profile         = true
diff --git a/variables.tf b/variables.tf
index 1f30170..72bd4d8 100644
--- a/variables.tf
+++ b/variables.tf
@@ -48,12 +48,6 @@ variable "karpenter_tag" {
   default     = "1.1.1"
 }
 
-variable "namespace" {
-  description = "Namespace in which to install cert manager"
-  type        = string
-  default     = "kube-system"
-}
-
 variable "subnets_name" {
   description = "Define the name of the subnets to be used by this cluster"
   type        = string