update to google-beta and tor docker image

.gitlab-ci.yml

@@ -10,7 +10,7 @@ stages:
 
 before_script:
   - TMPF=$(mktemp) || exit 1
-  - echo $GCLOUD_KEY2 > $TMPF
+  - echo $GCLOUD_KEY > $TMPF
   - export GOOGLE_APPLICATION_CREDENTIALS=$TMPF
   - gcloud auth activate-service-account --key-file=$TMPF
   - gcloud auth list

terraform/main.tf

@@ -12,6 +12,10 @@ provider "google" {
   project = "${var.project}"
 }
 
+provider "google-beta" {
+  project = "${var.project}"
+}
+
 module "blc" {
   source = "modules/blc"
 
@@ -64,4 +68,4 @@ module "tor" {
   tor_instance_type = "${var.tor_instance_type}"
   onion_host        = "${var.onion_host}"
   prom_service_acct = "${data.terraform_remote_state.lightning-store-prod.prometheus_service_account}"
-}
+}

terraform/modules/blc/main.tf

@@ -1,15 +1,19 @@
 # Instance group
 resource "google_compute_instance_group_manager" "blc" {
-  name  = "${var.name}-ig-${var.env}"
-  count = "${var.create_resources}"
+  name     = "${var.name}-ig-${var.env}"
+  count    = "${var.create_resources}"
+  provider = "google-beta"
 
   base_instance_name = "${var.name}-ig-${var.env}-${count.index}"
-  instance_template  = "${google_compute_instance_template.blc.self_link}"
   zone               = "${var.zone}"
   target_size        = 1
-  update_strategy    = "ROLLING_UPDATE"
 
-  rolling_update_policy {
+  version {
+    name              = "original"
+    instance_template = "${google_compute_instance_template.blc.self_link}"
+  }
+
+  update_policy {
     type                  = "PROACTIVE"
     minimal_action        = "REPLACE"
     max_surge_fixed       = 0

terraform/variables.tf

@@ -122,11 +122,6 @@ variable "ionosphere_sse_docker" {
 }
 
 # Less frequently updated images
-variable "node_exporter_docker" {
-  type    = "string"
-  default = "prom/node-exporter@sha256:55302581333c43d540db0e144cf9e7735423117a733cdec27716d87254221086"
-}
-
 variable "bitcoin_docker" {
   type    = "string"
   default = "blockstream/bitcoind@sha256:91ba0790a0080a99a529e73ef9b14e2d6cf0a30f81d54bfa3729bb47b105b36c"
@@ -144,7 +139,12 @@ variable "charge_docker" {
 
 variable "tor_docker" {
   type    = "string"
-  default = "blockstream/gcloud-tor@sha256:be56a33b3010ac4c85037899714979bb4eb6c15fe85114bd009501750320617f"
+  default = "blockstream/tor@sha256:381c57864470b9fc8813c910c220e45b007f8c2e8623815cd5c36bccfe0b762a"
+}
+
+variable "node_exporter_docker" {
+  type    = "string"
+  default = "prom/node-exporter@sha256:55302581333c43d540db0e144cf9e7735423117a733cdec27716d87254221086"
 }
 
 variable "gcloud_docker" {