Merge branch 'master' into docs/gke-arch-diagram

terraform-google-modules · Nov 5, 2024 · 656cada · 656cada
2 parents 9c7df8e + 0364375
commit 656cada
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 30 deletions.
diff --git a/examples/gh-runner-gke-dind-rootless/versions.tf b/examples/gh-runner-gke-dind-rootless/versions.tf
@@ -16,15 +16,11 @@
 
 terraform {
   required_providers {
-    # TODO: undo version constraint pending provider bug
-    # https://github.com/GoogleCloudPlatform/magic-modules/pull/11688
     google = {
-      source  = "hashicorp/google"
-      version = ">= 4.3.0, < 5.44"
+      source = "hashicorp/google"
     }
     google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.3.0, < 5.44"
+      source = "hashicorp/google-beta"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/examples/gh-runner-gke-dind/versions.tf b/examples/gh-runner-gke-dind/versions.tf
@@ -16,15 +16,11 @@
 
 terraform {
   required_providers {
-    # TODO: undo version constraint pending provider bug
-    # https://github.com/GoogleCloudPlatform/magic-modules/pull/11688
     google = {
-      source  = "hashicorp/google"
-      version = ">= 4.3.0, < 5.44"
+      source = "hashicorp/google"
     }
     google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.3.0, < 5.44"
+      source = "hashicorp/google-beta"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/examples/gh-runner-gke-simple/versions.tf b/examples/gh-runner-gke-simple/versions.tf
@@ -16,15 +16,11 @@
 
 terraform {
   required_providers {
-    # TODO: undo version constraint pending provider bug
-    # https://github.com/GoogleCloudPlatform/magic-modules/pull/11688
     google = {
-      source  = "hashicorp/google"
-      version = ">= 4.3.0, < 5.44"
+      source = "hashicorp/google"
     }
     google-beta = {
-      source  = "hashicorp/google-beta"
-      version = ">= 4.3.0, < 5.44"
+      source = "hashicorp/google-beta"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/modules/gh-runner-gke/main.tf b/modules/gh-runner-gke/main.tf
@@ -51,7 +51,7 @@ resource "google_compute_subnetwork" "gh-subnetwork" {
  *****************************************/
 module "runner-cluster" {
   source                   = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster/"
-  version                  = "~> 32.0"
+  version                  = "~> 33.0"
   project_id               = var.project_id
   name                     = "gh-runner-${var.cluster_suffix}"
   regional                 = false

diff --git a/modules/gh-runner-gke/outputs.tf b/modules/gh-runner-gke/outputs.tf
@@ -28,6 +28,7 @@ output "client_token" {
 
 output "ca_certificate" {
   description = "The cluster ca certificate (base64 encoded)"
+  sensitive   = true
   value       = module.runner-cluster.ca_certificate
 }
 

diff --git a/modules/gh-runner-mig-container-vm/main.tf b/modules/gh-runner-mig-container-vm/main.tf
@@ -151,7 +151,7 @@ module "gce-container" {
 
 module "mig_template" {
   source             = "terraform-google-modules/vm/google//modules/instance_template"
-  version            = "~> 11.0"
+  version            = "~> 12.0"
   project_id         = var.project_id
   region             = var.region
   network            = local.network_name
@@ -184,7 +184,7 @@ module "mig_template" {
  *****************************************/
 module "mig" {
   source            = "terraform-google-modules/vm/google//modules/mig"
-  version           = "~> 11.0"
+  version           = "~> 12.0"
   project_id        = var.project_id
   hostname          = local.instance_name
   region            = var.region

diff --git a/modules/gh-runner-mig-vm/main.tf b/modules/gh-runner-mig-vm/main.tf
@@ -119,7 +119,7 @@ locals {
 
 module "mig_template" {
   source             = "terraform-google-modules/vm/google//modules/instance_template"
-  version            = "~> 11.0"
+  version            = "~> 12.0"
   project_id         = var.project_id
   machine_type       = var.machine_type
   network            = local.network_name
@@ -152,7 +152,7 @@ module "mig_template" {
  *****************************************/
 module "mig" {
   source            = "terraform-google-modules/vm/google//modules/mig"
-  version           = "~> 11.0"
+  version           = "~> 12.0"
   project_id        = var.project_id
   hostname          = local.instance_name
   region            = var.region

diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -2,13 +2,13 @@ module github.com/terraform-google-modules/terraform-google-github-actions-runne
 
 go 1.22.0
 
-toolchain go1.22.7
+toolchain go1.22.8
 
 require (
 	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2
-	github.com/gruntwork-io/terratest v0.47.1
+	github.com/gruntwork-io/terratest v0.47.2
 	github.com/stretchr/testify v1.9.0
-	github.com/tidwall/gjson v1.17.3
+	github.com/tidwall/gjson v1.18.0
 )
 
 require (

diff --git a/test/integration/go.sum b/test/integration/go.sum
@@ -378,8 +378,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/gruntwork-io/go-commons v0.17.1 h1:2KS9wAqrgeOTWj33DSHzDNJ1FCprptWdLFqej+wB8x0=
 github.com/gruntwork-io/go-commons v0.17.1/go.mod h1:S98JcR7irPD1bcruSvnqupg+WSJEJ6xaM89fpUZVISk=
-github.com/gruntwork-io/terratest v0.47.1 h1:qOaxnL7Su5+KpDHYUN/ek1jn8ImvCKtOkaY4OSMS4tI=
-github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=
+github.com/gruntwork-io/terratest v0.47.2 h1:t6iWwsqJH7Gx0RwXleU/vjc+2c0JXRMdj3DxYXTBssQ=
+github.com/gruntwork-io/terratest v0.47.2/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4CBERWSCusbJ0d/64=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -489,8 +489,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
-github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=