github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(infra): Use naming_suffix in instance_group_manager (#7871)

Browse Source 
Google still had lingering Relay instance groups and subnets around from
a previous deployment that were deleted in the UI and gone, but then
popped back up.

Theoretically, the instance groups should be deleted because there is no
current Terraform config matching them. This change will ensure that
instance groups also get rolled over based on the naming suffix
introduced in #7870.

Related: #7870
This commit is contained in:
Jamil
2025-01-26 12:10:34 -08:00
committed by GitHub
parent 0454fb173d
commit d96276e1ac
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
terraform/environments/production/relays.tf
View File

@@ -353,15 +353,15 @@ module "relays" {
zones = ["us-west4-a"]
}
}
network = google_compute_network.network.self_link
instance_template_naming_suffix = random_string.naming_suffix.result
container_registry = module.google-artifact-registry.url
image_repo = module.google-artifact-registry.repo
image = "relay"
image_tag = local.relay_image_tag
observability_log_level = "info,hyper=off,h2=warn,tower=warn"
application_name = "relay"
application_version = replace(local.relay_image_tag, ".", "-")
network = google_compute_network.network.self_link
naming_suffix = random_string.naming_suffix.result
container_registry = module.google-artifact-registry.url
image_repo = module.google-artifact-registry.repo
image = "relay"
image_tag = local.relay_image_tag
observability_log_level = "info,hyper=off,h2=warn,tower=warn"
application_name = "relay"
application_version = replace(local.relay_image_tag, ".", "-")
application_environment_variables = [
{
name = "FIREZONE_TELEMETRY"

18
terraform/environments/staging/relays.tf
View File

@@ -348,15 +348,15 @@ module "relays" {
zones = ["us-west4-a"]
}
}
network = google_compute_network.network.self_link
instance_template_naming_suffix = random_string.naming_suffix.result
container_registry = module.google-artifact-registry.url
image_repo = module.google-artifact-registry.repo
image = "relay"
image_tag = var.image_tag
observability_log_level = "info,hyper=off,h2=warn,tower=warn"
application_name = "relay"
application_version = replace(var.image_tag, ".", "-")
network = google_compute_network.network.self_link
naming_suffix = random_string.naming_suffix.result
container_registry = module.google-artifact-registry.url
image_repo = module.google-artifact-registry.repo
image = "relay"
image_tag = var.image_tag
observability_log_level = "info,hyper=off,h2=warn,tower=warn"
application_name = "relay"
application_version = replace(var.image_tag, ".", "-")
application_environment_variables = [
{
name = "FIREZONE_TELEMETRY"

4
terraform/modules/google-cloud/apps/relay/main.tf
View File

@@ -147,7 +147,7 @@ resource "google_compute_instance_template" "application" {
project = var.project_id
name_prefix = "${local.application_name}-${each.key}-${var.instance_template_naming_suffix}-"
name_prefix = "${local.application_name}-${each.key}-${var.naming_suffix}-"
description = "This template is used to create ${local.application_name} instances using Terraform."
@@ -302,7 +302,7 @@ resource "google_compute_region_instance_group_manager" "application" {
project = var.project_id
name = "${local.application_name}-group-${each.key}"
name = "${local.application_name}-group-${each.key}-${var.naming_suffix}"
base_instance_name = local.application_name

6
terraform/modules/google-cloud/apps/relay/variables.tf
View File

@@ -23,10 +23,10 @@ variable "network" {
description = "ID of a Google Cloud Network"
}
# Ensure instance group template is recreated when this value is changed.
variable "instance_template_naming_suffix" {
# Ensure instances are recreated when this is changed.
variable "naming_suffix" {
type = string
description = "Suffix to append to the name of the instance group template."
description = "Suffix to append to the name of resources."
}
################################################################################