Skip to content

Commit

Permalink
Allow witness IDs to be routed to binary on a per-env basis (transpar…
Browse files Browse the repository at this point in the history
…ency-dev#78)

CI and prod environments are untouched from this change. The dev environment is now configured with the non-AW omniwitness keys by known operators.
  • Loading branch information
mhutchinson authored Jan 31, 2024
1 parent 434e791 commit 014ccc1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
5 changes: 5 additions & 0 deletions deployment/live/dev/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ inputs = merge(
{
docker_tag = "latest"
env = "dev"
extra_args = [
"--witkey=mhutchinson.witness+384b3dbc+AfWg+7+qmcFoMuIM0ZGe4ZsIuc6gEg3EL0cKkNVolCA+",
"--witkey=wolsey-bank-alfred+0336ecb0+AVcofP6JyFkxhQ+/FK7omBtGLVS22tGC6fH+zvK5WrIx",
"--witkey=JKU-INS+814e35bf+AdYBKkmgKGzao81EKOSxkphZLDtgBf72VXHFOIhMmqvO",
]
}
)

4 changes: 2 additions & 2 deletions deployment/modules/distributor/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,11 @@ resource "google_cloud_run_v2_service" "default" {
template {
containers {
image = "gcr.io/trillian-opensource-ci/distributor:${var.docker_tag}" # Image to deploy
args = [
args = concat([
"--logtostderr",
"--v=1",
"--use_cloud_sql",
]
], var.extra_args)

env {
name = "INSTANCE_CONNECTION_NAME"
Expand Down
6 changes: 6 additions & 0 deletions deployment/modules/distributor/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ variable "docker_tag" {
type = string
}

variable "extra_args" {
description = "Extra arguments to be provided to the distributor invoked in cloud run"
type = list(string)
default = []
}

variable "network_name" {
default = "mysql-private"
type = string
Expand Down

0 comments on commit 014ccc1

Please sign in to comment.