From 241b9aff67b85eb21652c147ae1800bd56d73a87 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Mon, 16 Dec 2024 11:21:57 -0600
Subject: [PATCH 1/5] Update values.tftpl

---
 tf_files/gen3/values.tftpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tf_files/gen3/values.tftpl b/tf_files/gen3/values.tftpl
index 1a78822..efff5e4 100644
--- a/tf_files/gen3/values.tftpl
+++ b/tf_files/gen3/values.tftpl
@@ -56,9 +56,6 @@ dicom-viewer:
   externalSecrets:
     dbcreds: "${vpc_name}_${namespace}-dicom-viewer-creds"
 
-external-secrets:
-  enabled: ${deploy_external_secrets}
-
 fence:
   enabled: ${fence_enabled}
   serviceAccount:
@@ -178,8 +175,8 @@ pidgin:
 portal:
   enabled: ${portal_enabled}
   gitops:
-  json: | 
-    ${gitops_file}
+    json: | 
+      ${gitops_file}
 
 requestor:
   enabled: ${requestor_enabled}
@@ -200,6 +197,9 @@ sheepdog:
 ssjdispatcher:
   enabled: ${ssjdispatcher_enabled}
 
+sower:
+  enabled: ${sowed_enabled}
+
 wts:
   enabled: ${wts_enabled}
   externalSecrets:

From 0691e3c3c6410c262b8dec899ca4433d6af5c3c4 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Mon, 16 Dec 2024 11:26:10 -0600
Subject: [PATCH 2/5] Update values.tftpl

---
 tf_files/gen3/values.tftpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tf_files/gen3/values.tftpl b/tf_files/gen3/values.tftpl
index efff5e4..88672ac 100644
--- a/tf_files/gen3/values.tftpl
+++ b/tf_files/gen3/values.tftpl
@@ -5,6 +5,8 @@ global:
     hatchery_role: ${hatchery_service_account}
 
   dev: false
+  externalSecrets:
+    deploy: true
   postgres:
     dbCreate: false
     externalSecret: "${vpc_name}_aurora-master-password"

From 60b0ddad89a0078670ec8fab605ea25f26d4ff74 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Mon, 16 Dec 2024 11:26:51 -0600
Subject: [PATCH 3/5] Update root.tf

---
 tf_files/gen3/root.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf_files/gen3/root.tf b/tf_files/gen3/root.tf
index 97d9f84..2d88f3d 100644
--- a/tf_files/gen3/root.tf
+++ b/tf_files/gen3/root.tf
@@ -51,6 +51,7 @@ locals {
       slack_send_dbgap = var.slack_send_dbgap
       slack_webhook = var.slack_webhook
       ssjdispatcher_enabled = var.ssjdispatcher_enabled
+      sower_enabled = var.sower_enabled
       tier_access_level = var.tier_access_level
       tier_access_limit = var.tier_access_limit
       usersync_enabled = var.usersync_enabled

From 92974103bd8609c10186ad5b56c3c29aa54f71dd Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Mon, 16 Dec 2024 11:27:30 -0600
Subject: [PATCH 4/5] Update variables.tf

---
 tf_files/gen3/variables.tf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tf_files/gen3/variables.tf b/tf_files/gen3/variables.tf
index d362e80..1a372dc 100644
--- a/tf_files/gen3/variables.tf
+++ b/tf_files/gen3/variables.tf
@@ -249,6 +249,12 @@ variable "ssjdispatcher_enabled" {
   default     = true
 }
 
+variable "sower_enabled" {
+  description = "Enable sower"
+  type        = bool
+  default     = true
+}
+
 variable "tier_access_level" {
   description = "Tier access level for guppy"
   default     = "private"

From 6be582d6ff7b481406fc6745ac7ff3c6ff3bfb4d Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Mon, 16 Dec 2024 11:30:49 -0600
Subject: [PATCH 5/5] Update values.tftpl

---
 tf_files/gen3/values.tftpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tf_files/gen3/values.tftpl b/tf_files/gen3/values.tftpl
index 88672ac..45cb06e 100644
--- a/tf_files/gen3/values.tftpl
+++ b/tf_files/gen3/values.tftpl
@@ -37,7 +37,7 @@ argo-wrapper:
 audit:
   enabled: ${audit_enabled}
   serviceAccount:
-    annotations: "eks.amazonaws.com/role-arn: ${audit_service_account}"
+    eks.amazonaws.com/role-arn: ${audit_service_account}
   externalSecrets:
     dbcreds: "${vpc_name}_${namespace}-audit-creds"    
 
@@ -61,7 +61,7 @@ dicom-viewer:
 fence:
   enabled: ${fence_enabled}
   serviceAccount:
-    annotations: "eks.amazonaws.com/role-arn: ${fence_service_account}"
+    eks.amazonaws.com/role-arn: ${fence_service_account}
    
   externalSecrets:
     fenceJwtKeys: ""