From 00d8d4be01a9098f52071425cedfd365190885dc Mon Sep 17 00:00:00 2001 From: Andrew Dryga Date: Wed, 25 Oct 2023 19:02:01 -0600 Subject: [PATCH] Hotfix cluster version selection --- .github/workflows/cd.yml | 3 +-- terraform/environments/production/main.tf | 2 +- terraform/environments/staging/main.tf | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 65d371b71..b2d754465 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -252,8 +252,7 @@ jobs: uses: docker/metadata-action@v5 with: images: - ${{ steps.login.outputs.registry }}/firezone/${{ matrix.image_name - }} + ${{ steps.login.outputs.registry }}/firezone/${{ matrix.image_name }} tags: | type=raw,value=${{ github.sha }} type=raw,value=${{ env.VERSION }} diff --git a/terraform/environments/production/main.tf b/terraform/environments/production/main.tf index 456f07d02..2d3a1e1ee 100644 --- a/terraform/environments/production/main.tf +++ b/terraform/environments/production/main.tf @@ -356,7 +356,7 @@ locals { project_id = module.google-cloud-project.project.project_id cluster_name = local.cluster.name cluster_name_label = "cluster_name" - cluster_version_label = "version" + cluster_version_label = "cluster_version" cluster_version = split(".", var.image_tag)[0] node_name_label = "application" polling_interval_ms = 7000 diff --git a/terraform/environments/staging/main.tf b/terraform/environments/staging/main.tf index 053e97a2c..b0a08d11b 100644 --- a/terraform/environments/staging/main.tf +++ b/terraform/environments/staging/main.tf @@ -362,7 +362,7 @@ locals { project_id = module.google-cloud-project.project.project_id cluster_name = local.cluster.name cluster_name_label = "cluster_name" - cluster_version_label = "version" + cluster_version_label = "cluster_version" cluster_version = split(".", var.image_tag)[0] node_name_label = "application" polling_interval_ms = 7000