Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update values.tftpl #30

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tf_files/gen3/root.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions tf_files/gen3/values.tftpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ global:
hatchery_role: ${hatchery_service_account}

dev: false
externalSecrets:
deploy: true
postgres:
dbCreate: false
externalSecret: "${vpc_name}_aurora-master-password"
Expand Down Expand Up @@ -35,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"

Expand All @@ -56,13 +58,10 @@ dicom-viewer:
externalSecrets:
dbcreds: "${vpc_name}_${namespace}-dicom-viewer-creds"

external-secrets:
enabled: ${deploy_external_secrets}

fence:
enabled: ${fence_enabled}
serviceAccount:
annotations: "eks.amazonaws.com/role-arn: ${fence_service_account}"
eks.amazonaws.com/role-arn: ${fence_service_account}

externalSecrets:
fenceJwtKeys: ""
Expand Down Expand Up @@ -178,8 +177,8 @@ pidgin:
portal:
enabled: ${portal_enabled}
gitops:
json: |
${gitops_file}
json: |
${gitops_file}

requestor:
enabled: ${requestor_enabled}
Expand All @@ -200,6 +199,9 @@ sheepdog:
ssjdispatcher:
enabled: ${ssjdispatcher_enabled}

sower:
enabled: ${sowed_enabled}

wts:
enabled: ${wts_enabled}
externalSecrets:
Expand Down
6 changes: 6 additions & 0 deletions tf_files/gen3/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading