[#77] Add annotations to server SA

odahu · Apr 7, 2021 · b7322c0 · b7322c0
1 parent fc73ec2
commit b7322c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/terraform/modules/k8s/argo/main/main.tf b/terraform/modules/k8s/argo/main/main.tf
@@ -13,6 +13,7 @@ locals {
 #  var.configuration.workflows_namespace == "" ? {} : {
   server = {
     server = {
+      baseHref = "/argo/"
       serviceAccountAnnotations = {
         "iam.gke.io/gcp-service-account" = var.workflows_sa
       }
@@ -190,6 +191,7 @@ resource "helm_release" "argo_workflows" {
       pgsql_enabled = var.pgsql.enabled
       workflow            = yamlencode(local.workflow)
       artifact_repository = yamlencode(local.artifact_repository)
+      server              = yamlencode(local.server)
       #      workflows_namespace = local.workflows_namespace
       #      node_selector = var.configuration.node_pool[keys(var.configuration.node_pool)[0]].labels.mode
       #      node_taint    = var.configuration.node_pool[keys(var.configuration.node_pool)[0]].taints[0].value

diff --git a/terraform/modules/k8s/argo/main/templates/argo-workflows.yaml b/terraform/modules/k8s/argo/main/templates/argo-workflows.yaml
@@ -1,5 +1,4 @@
-server:
-  baseHref: /argo/
+${server}
 singleNamespace: false
 useDefaultArtifactRepo: true
 ${artifact_repository}