Skip to content

chore: follow upstream debian version #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions examples/safer_cluster_iap_bastion/bastion.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/setup/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down