chore: safer_cluster_iap_bastion follow upstream debian version (terraform-google-modules#1342)

Author: apeabody

Makefile

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

build/int.cloudbuild.yaml

@@ -361,6 +361,6 @@ tags:
 - 'integration'
 substitutions:
  _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.4'
+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'
 options:
  machineType: 'N1_HIGHCPU_8'

build/lint.cloudbuild.yaml

@@ -22,7 +22,7 @@ tags:
 - 'lint'
 substitutions:
  _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.4'
+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'
 options:
  machineType: 'N1_HIGHCPU_8'
  env:

examples/safer_cluster_iap_bastion/bastion.tf

@@ -28,7 +28,7 @@ data "template_file" "startup_script" {
 
 module "bastion" {
  source = "terraform-google-modules/bastion-host/google"
- version = "~> 4.1"
+ version = "~> 5.0"
 
  network = module.vpc.network_self_link
  subnet = module.vpc.subnets_self_links[0]
@@ -37,7 +37,6 @@ module "bastion" {
  name = local.bastion_name
  zone = local.bastion_zone
  image_project = "debian-cloud"
- image_family = "debian-9"
  machine_type = "g1-small"
  startup_script = data.template_file.startup_script.rendered
  members = var.bastion_members

test/setup/main.tf

@@ -46,7 +46,7 @@ locals {
 
 module "gke-project-1" {
  source = "terraform-google-modules/project-factory/google"
- version = "~> 11.3"
+ version = "~> 13.0"
 
  name = "ci-gke-${random_id.random_project_id_suffix.hex}"
  random_project_id = true
@@ -69,7 +69,7 @@ module "gke-project-1" {
 
 module "gke-project-2" {
  source = "terraform-google-modules/project-factory/google"
- version = "~> 11.3"
+ version = "~> 13.0"
 
  name = "ci-gke-${random_id.random_project_id_suffix.hex}"
  random_project_id = true
@@ -91,7 +91,7 @@ module "gke-project-2" {
 # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project
 module "gke-project-asm" {
  source = "terraform-google-modules/project-factory/google"
- version = "~> 11.3"
+ version = "~> 13.0"
 
  name = "ci-gke-asm-${random_id.random_project_id_suffix.hex}"
  random_project_id = true

test/setup/versions.tf

@@ -19,11 +19,11 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = "4.1.0"
+ version = "~> 4.1"
  }
  google-beta = {
  source = "hashicorp/google-beta"
- version = "4.3.0"
+ version = "~> 4.3"
  }
  random = {
  source = "hashicorp/random"