[#77] Use separate workflows namespace if provided

odahu · Apr 6, 2021 · 7cedf1d · 7cedf1d
1 parent 8e274a4
commit 7cedf1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/terraform/modules/k8s/argo/main/main.tf b/terraform/modules/k8s/argo/main/main.tf
@@ -4,7 +4,7 @@ locals {
   pg_username = local.pg_credentials_plain == 1 ? var.pgsql.db_password : lookup(lookup(data.kubernetes_secret.pg[0], "data", {}), "username", "")
   pg_password = local.pg_credentials_plain == 1 ? var.pgsql.db_user : lookup(lookup(data.kubernetes_secret.pg[0], "data", {}), "password", "")
 
-#  workflows_namespace = var.configuration.workflows_namespace == "" ? var.configuration.namespace : var.configuration.workflows_namespace
+  workflows_namespace = var.configuration.workflows_namespace == "" ? var.configuration.namespace : var.configuration.workflows_namespace
 #  workflows_namespace = var.configuration.workflows_namespace == "" ? {
 #    should be added to workflows runners not to workflow server
 #          annotations = {
@@ -37,7 +37,7 @@ locals {
     controller = {
       workflowDefaults = {
         metadata = {
-          namespace = var.configuration.workflows_namespace
+          namespace = local.workflows_namespace
         }
         spec = {
           serviceAccountName = "argo-workflow"

diff --git a/terraform/modules/k8s/argo/main/templates/argo-workflows.yaml b/terraform/modules/k8s/argo/main/templates/argo-workflows.yaml
@@ -1,6 +1,6 @@
 server:
   baseHref: /argo/
-singleNamespace: true
+singleNamespace: false
 useDefaultArtifactRepo: true
 %{ if pgsql_enabled }
 ${controller}