Added labels to spot instance on ts (#106)

* Added builder for latest vecsim features * Include 2 extra builder/runner setups for vecsim benchmarks on ubuntu 22.04 * Fixed base image for timeseries * Added labels to spot instance on ts
redis-performance · Jul 23, 2024 · 40cfafd · 40cfafd
1 parent 8573f1b
commit 40cfafd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/terraform/oss-redistimeseries-m5-spot-instances/bench-client-resources.tf b/terraform/oss-redistimeseries-m5-spot-instances/bench-client-resources.tf
@@ -19,6 +19,32 @@ resource "aws_spot_instance_request" "client" {
     delete_on_termination = true
   }
 
+  volume_tags = {
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
+    Name           = "ebs_block_device-${var.setup_name}-CLIENT-${count.index + 1}"
+    setup          = "${var.setup_name}"
+    triggering_env = "${var.triggering_env}"
+    github_actor   = "${var.github_actor}"
+    github_org     = "${var.github_org}"
+    github_repo    = "${var.github_repo}"
+    github_sha     = "${var.github_sha}"
+    timeout_secs   = "${var.timeout_secs}"
+  }
+
+  tags = {
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
+    Name           = "${var.setup_name}-CLIENT-${count.index + 1}"
+    setup          = "${var.setup_name}"
+    triggering_env = "${var.triggering_env}"
+    github_actor   = "${var.github_actor}"
+    github_org     = "${var.github_org}"
+    github_repo    = "${var.github_repo}"
+    github_sha     = "${var.github_sha}"
+    timeout_secs   = "${var.timeout_secs}"
+  }
+
   ################################################################################
   # This will ensure we wait here until the instance is ready to receive the ssh connection 
   ################################################################################

diff --git a/terraform/oss-redistimeseries-m5-spot-instances/db-resources.tf b/terraform/oss-redistimeseries-m5-spot-instances/db-resources.tf
@@ -32,6 +32,20 @@ resource "aws_spot_instance_request" "server" {
     timeout_secs   = "${var.timeout_secs}"
   }
 
+
+  tags = {
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
+    Name           = "${var.setup_name}-DB-${count.index + 1}"
+    setup          = "${var.setup_name}"
+    triggering_env = "${var.triggering_env}"
+    github_actor   = "${var.github_actor}"
+    github_org     = "${var.github_org}"
+    github_repo    = "${var.github_repo}"
+    github_sha     = "${var.github_sha}"
+    timeout_secs   = "${var.timeout_secs}"
+  }
+
 
   ################################################################################
   # This will ensure we wait here until the instance is ready to receive the ssh connection