From ef27d2e9d1a74fb9f7ad6cd2037dc759e23e04e8 Mon Sep 17 00:00:00 2001
From: Simone Ruffilli <sruffilli@google.com>
Date: Wed, 13 Jul 2022 13:57:03 +0200
Subject: [PATCH] Use spot VMs for test VM and for NVAs (#734)

---
 fast/stages/02-networking-nva/nva.tf          |  4 +-
 .../02-networking-nva/test-resources.tf       | 48 +++++++++++++++++--
 .../02-networking-peering/test-resources.tf   | 15 ++++++
 .../02-networking-vpn/test-resources.tf       | 15 ++++++
 4 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/fast/stages/02-networking-nva/nva.tf b/fast/stages/02-networking-nva/nva.tf
index 85353525..ed882a25 100644
--- a/fast/stages/02-networking-nva/nva.tf
+++ b/fast/stages/02-networking-nva/nva.tf
@@ -58,9 +58,7 @@ module "nva-template-ew1" {
   options = {
     allow_stopping_for_update = true
     deletion_protection       = false
-    # Creates preemptible instances, cheaper than regular one. Only suitable for testing.
-    preemptible = true
-    spot        = true
+    spot                      = true
   }
   metadata = {
     startup-script = templatefile(
diff --git a/fast/stages/02-networking-nva/test-resources.tf b/fast/stages/02-networking-nva/test-resources.tf
index 9c259c7f..e7801dfe 100644
--- a/fast/stages/02-networking-nva/test-resources.tf
+++ b/fast/stages/02-networking-nva/test-resources.tf
@@ -16,7 +16,7 @@
 
 # tfdoc:file:description temporary instances for testing
 
-# Untrusted (Landing)
+# # Untrusted (Landing)
 
 # module "test-vm-landing-untrusted-ew1-0" {
 #   source     = "../../../modules/compute-vm"
@@ -37,6 +37,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -64,6 +69,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -72,7 +82,7 @@
 #   }
 # }
 
-# Trusted (hub)
+# # Trusted (hub)
 
 # module "test-vm-landing-trusted-ew1-0" {
 #   source     = "../../../modules/compute-vm"
@@ -93,6 +103,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -120,6 +135,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -128,7 +148,7 @@
 #   }
 # }
 
-# Dev spoke
+# # Dev spoke
 
 # module "test-vm-dev-ew1-0" {
 #   source     = "../../../modules/compute-vm"
@@ -150,6 +170,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -178,6 +203,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -186,7 +216,7 @@
 #   }
 # }
 
-# Prod spoke
+# # Prod spoke
 
 # module "test-vm-prod-ew1-0" {
 #   source     = "../../../modules/compute-vm"
@@ -208,6 +238,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -236,6 +271,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
diff --git a/fast/stages/02-networking-peering/test-resources.tf b/fast/stages/02-networking-peering/test-resources.tf
index 8139e755..d6523a94 100644
--- a/fast/stages/02-networking-peering/test-resources.tf
+++ b/fast/stages/02-networking-peering/test-resources.tf
@@ -35,6 +35,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -63,6 +68,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -91,6 +101,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
diff --git a/fast/stages/02-networking-vpn/test-resources.tf b/fast/stages/02-networking-vpn/test-resources.tf
index 8139e755..d6523a94 100644
--- a/fast/stages/02-networking-vpn/test-resources.tf
+++ b/fast/stages/02-networking-vpn/test-resources.tf
@@ -35,6 +35,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -63,6 +68,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update
@@ -91,6 +101,11 @@
 #     type  = "pd-balanced"
 #     size  = 10
 #   }
+#   options = {
+#     allow_stopping_for_update = true
+#     deletion_protection       = false
+#     spot                      = true
+#   }
 #   metadata = {
 #     startup-script = <<EOF
 #       apt update