Merge branch 'main' into config-change

Author: glasnt

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 DOCKER_BIN ?= docker

build/int.cloudbuild.yaml

@@ -105,4 +105,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'

build/lint.cloudbuild.yaml

@@ -22,4 +22,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'

compute/zonal_mig_standby_policy/main.tf

@@ -14,11 +14,22 @@
  * limitations under the License.
  */
 /** Made to resemble
- * gcloud beta compute instance-groups managed update standby-mig \
+ * gcloud compute instance-groups managed update standby-mig \
  * --standby-policy-mode=scale-out-pool \
  * --standby-policy-initial-delay=50 \
+ * --target-size=3\
  * --zone=us-central1-f
  */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 6.16.0"
+    }
+  }
+}
+
 # [START compute_zonal_instance_group_manager_standby_policy_parent_tag]
 resource "google_compute_instance_template" "default" {
   name         = "an-instance-template"
@@ -35,7 +46,6 @@ resource "google_compute_instance_template" "default" {
 
 # [START compute_zonal_instance_group_manager_standby_policy_tag]
 resource "google_compute_instance_group_manager" "default" {
-  provider           = google-beta
   name               = "standby-mig"
   base_instance_name = "test"
   target_size        = 3

compute/zonal_mig_standby_policy_with_resize/main.tf

@@ -0,0 +1,69 @@
+/**
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Made to resemble
+ * gcloud compute instance-groups managed update standby-mig \
+ * --standby-policy-mode=scale-out-pool \
+ * --standby-policy-initial-delay=50 \
+ * --target-size=1 \
+ * --suspended-size=1 \
+ * --stopped-size=2 \
+ * --zone=us-central1-f
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 6.16.0"
+    }
+  }
+}
+
+# [START compute_zonal_mig_standby_policy_with_resize_parent_tag]
+resource "google_compute_instance_template" "default" {
+  name         = "standby-mig-instance-template"
+  machine_type = "e2-medium"
+
+  disk {
+    source_image = "debian-cloud/debian-11"
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+
+# [START compute_zonal_mig_standby_policy_with_resize_tag]
+resource "google_compute_instance_group_manager" "default" {
+  name                  = "standby-mig"
+  base_instance_name    = "test"
+  target_size           = 1
+  target_suspended_size = 1
+  target_stopped_size   = 2
+  zone                  = "us-central1-f"
+
+  version {
+    instance_template = google_compute_instance_template.default.id
+    name              = "primary"
+  }
+  standby_policy {
+    initial_delay_sec = 50
+    mode              = "SCALE_OUT_POOL"
+  }
+}
+# [END compute_zonal_mig_standby_policy_with_resize_tag]
+# [END compute_zonal_mig_standby_policy_with_resize_parent_tag]