chore: tags

update grafana tagging style
bcgov · Oct 30, 2024 · 7385a2c · 7385a2c
1 parent 29dadcb
commit 7385a2c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/terraform.yaml b/.github/workflows/terraform.yaml
@@ -48,6 +48,7 @@ jobs:
         LOKI_AUTH_TOKEN=${{ secrets.LOKI_AUTH_TOKEN_DEV }}
         LOKI_BUCKET_NAME=${{ vars.LOKI_BUCKET_NAME_DEV }}
         S3_BACKEND_NAME=${{vars.S3_BACKEND_NAME_DEV}}
+        LOKI_TAG=dev
 
         EOF
 
@@ -60,6 +61,7 @@ jobs:
         LOKI_AUTH_TOKEN=${{ secrets.LOKI_AUTH_TOKEN_PROD }}
         LOKI_BUCKET_NAME=${{ vars.LOKI_BUCKET_NAME_PROD }}
         S3_BACKEND_NAME=${{vars.S3_BACKEND_NAME_PROD}}
+        LOKI_TAG=prod
 
         EOF
 
@@ -84,9 +86,9 @@ jobs:
         terraform init -backend-config=backend.hcl
 
     - name: Terraform Plan
-      run: terraform plan -var "auth_secret=${{env.LOKI_AUTH_TOKEN}}" -var "bucket_name=${{ env.LOKI_BUCKET_NAME }}" -no-color
+      run: terraform plan -var "auth_secret=${{env.LOKI_AUTH_TOKEN}}" -var "bucket_name=${{ env.LOKI_BUCKET_NAME }}" -var "loki_tag=${{env.LOKI_TAG}}" -no-color
       working-directory: ./terraform-ecs
 
     - name: Terraform Apply
-      run: terraform apply -var "auth_secret=${{env.LOKI_AUTH_TOKEN}}" -var "bucket_name=${{ env.LOKI_BUCKET_NAME }}" -auto-approve
+      run: terraform apply -var "auth_secret=${{env.LOKI_AUTH_TOKEN}}" -var "bucket_name=${{ env.LOKI_BUCKET_NAME }}" -var "loki_tag=${{env.LOKI_TAG}}" -auto-approve
       working-directory: ./terraform-ecs
diff --git a/terraform-ecs/ecs.tf b/terraform-ecs/ecs.tf
@@ -13,7 +13,7 @@ resource "aws_ecs_task_definition" "loki_write" {
 
   container_definitions = jsonencode([{
     name      = "loki-write"
-    image     = "ghcr.io/bcgov/sso-grafana:ssoteam-2010"
+    image     = "ghcr.io/bcgov/sso-grafana:${var.loki_tag}"
     essential = true
     memory    = var.loki_write_memory
     cpu       = var.loki_write_cpu
@@ -113,7 +113,7 @@ resource "aws_ecs_task_definition" "loki_read" {
 
   container_definitions = jsonencode([{
     name      = "loki-read"
-    image     = "ghcr.io/bcgov/sso-grafana:ssoteam-2010"
+    image     = "ghcr.io/bcgov/sso-grafana:${var.loki_tag}"
     essential = true
     memory    = var.loki_read_memory
     cpu       = var.loki_read_cpu

diff --git a/terraform-ecs/variables.tf b/terraform-ecs/variables.tf
@@ -48,3 +48,8 @@ variable "loki_write_memory" {
 variable "bucket_name" {
   type    = string
 }
+
+variable "loki_tag" {
+  type = string
+  default = "dev"
+}