fixing my var

aws-ia · Sep 20, 2022 · 403c3b1 · 403c3b1
1 parent 8b12d40
commit 403c3b1
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/modules/kubernetes-addons/variables.tf b/modules/kubernetes-addons/variables.tf
@@ -667,12 +667,6 @@ variable "cert_manager_letsencrypt_email" {
   default     = ""
 }
 
-<<<<<<< HEAD
-variable "cert_manager_kubernetes_svc_image_pull_secrets" {
-  description = "list(string) of kubernetes imagePullSecrets"
-  type        = list(string)
-  default     = []
-=======
 variable "enable_cert_manager_csi_driver" {
   description = "Enable Cert Manager CSI Driver add-on"
   type        = bool
@@ -683,7 +677,12 @@ variable "cert_manager_csi_driver_helm_config" {
   description = "Cert Manager CSI Driver Helm Chart config"
   type        = any
   default     = {}
->>>>>>> main
+}
+
+variable "cert_manager_kubernetes_svc_image_pull_secrets" {
+  description = "list(string) of kubernetes imagePullSecrets"
+  type        = list(string)
+  default     = []
 }
 
 #-----------Argo Rollouts ADDON-------------