From a13ce8e4e56d5dd70bd16cafdd38bd5b0f0eb5e2 Mon Sep 17 00:00:00 2001 From: Andrew Dryga Date: Wed, 1 May 2024 20:29:46 -0600 Subject: [PATCH] Stop using process substitution in gateway cloud init file --- .../google-cloud/apps/gateway-region-instance-group/main.tf | 4 +++- .../gateway-region-instance-group/templates/cloud-init.yaml | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/terraform/modules/google-cloud/apps/gateway-region-instance-group/main.tf b/terraform/modules/google-cloud/apps/gateway-region-instance-group/main.tf index 9821377ce..123fbcc60 100644 --- a/terraform/modules/google-cloud/apps/gateway-region-instance-group/main.tf +++ b/terraform/modules/google-cloud/apps/gateway-region-instance-group/main.tf @@ -9,7 +9,9 @@ locals { application = "firezone-gateway" }, var.labels) - network_tags = ["firezone-gateways-${var.name}"] + network_tags = [ + "firezone-gateways-${var.name}" + ] google_health_check_ip_ranges = [ "130.211.0.0/22", diff --git a/terraform/modules/google-cloud/apps/gateway-region-instance-group/templates/cloud-init.yaml b/terraform/modules/google-cloud/apps/gateway-region-instance-group/templates/cloud-init.yaml index 5473c4af1..6973477a8 100644 --- a/terraform/modules/google-cloud/apps/gateway-region-instance-group/templates/cloud-init.yaml +++ b/terraform/modules/google-cloud/apps/gateway-region-instance-group/templates/cloud-init.yaml @@ -8,6 +8,7 @@ packages: - apt-transport-https - ca-certificates - software-properties-common + - curl write_files: - path: /etc/apt/keyrings @@ -48,4 +49,6 @@ runcmd: export FIREZONE_LOG_FORMAT="google-cloud" export FIREZONE_GOOGLE_CLOUD_PROJECT_ID="${project_id}" export FIREZONE_OTLP_GRPC_ENDPOINT="${otlp_grpc_endpoint}" - bash <(curl -fsSL https://raw.githubusercontent.com/firezone/firezone/main/scripts/gateway-systemd-install.sh) + curl -fsSL https://raw.githubusercontent.com/firezone/firezone/main/scripts/gateway-systemd-install.sh -o /tmp/gateway-install.sh + bash /tmp/gateway-install.sh + rm /tmp/gateway-install.sh