fix!: update examples, bump gke module version (#52)

* fix!: update examples, bump gke module version * bump img
terraform-google-modules · Feb 2, 2022 · 882578e · 882578e
1 parent 1aebd31
commit 882578e
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.1
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.3
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -58,4 +58,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.1'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'
diff --git a/examples/gh-org-runner-mig-native-simple/providers.tf b/examples/gh-org-runner-mig-native-simple/providers.tf
@@ -18,11 +18,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/gh-runner-gke-dind/providers.tf b/examples/gh-runner-gke-dind/providers.tf
@@ -22,8 +22,6 @@ data "google_client_config" "default" {
 }
 
 provider "kubernetes" {
-  version                = "~> 1.10"
-  load_config_file       = false
   host                   = module.runner-gke.kubernetes_endpoint
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.runner-gke.ca_certificate)

diff --git a/examples/gh-runner-gke-dind/versions.tf b/examples/gh-runner-gke-dind/versions.tf
@@ -18,15 +18,15 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.1"
+      version = "~> 4.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.1"
+      version = "~> 4.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/gh-runner-gke-simple/providers.tf b/examples/gh-runner-gke-simple/providers.tf
@@ -21,8 +21,6 @@ data "google_client_config" "default" {
 }
 
 provider "kubernetes" {
-  version                = "~> 1.10"
-  load_config_file       = false
   host                   = module.runner-gke.kubernetes_endpoint
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.runner-gke.ca_certificate)

diff --git a/examples/gh-runner-gke-simple/versions.tf b/examples/gh-runner-gke-simple/versions.tf
@@ -18,15 +18,15 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.1"
+      version = "~> 4.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.1"
+      version = "~> 4.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/gh-runner-mig-container-vm-dind/versions.tf b/examples/gh-runner-mig-container-vm-dind/versions.tf
@@ -18,11 +18,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/gh-runner-mig-container-vm-simple/versions.tf b/examples/gh-runner-mig-container-vm-simple/versions.tf
@@ -18,11 +18,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/gh-runner-mig-native-packer/providers.tf b/examples/gh-runner-mig-native-packer/providers.tf
@@ -16,9 +16,9 @@
 
 
 provider "google" {
-  version = "~> 3.16"
+  version = "~> 4.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.16"
+  version = "~> 4.0"
 }
diff --git a/examples/gh-runner-mig-native-simple/versions.tf b/examples/gh-runner-mig-native-simple/versions.tf
@@ -18,11 +18,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53, < 5.0.0"
+      version = "~> 4.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/kitchen.yml b/kitchen.yml
@@ -16,6 +16,7 @@
 driver:
   name: terraform
   command_timeout: 2700
+  verify_version: false
 
 provisioner:
   name: terraform

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

diff --git a/modules/gh-runner-gke/versions.tf b/modules/gh-runner-gke/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = ">= 4.3.0, < 5.0"
     }
   }
 

diff --git a/modules/gh-runner-mig-container-vm/versions.tf b/modules/gh-runner-mig-container-vm/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = ">= 3.53, < 5.0.0"
     }
   }
 

diff --git a/modules/gh-runner-mig-vm/versions.tf b/modules/gh-runner-mig-vm/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53, < 5.0.0"
+      version = ">= 3.53, < 5.0.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53, < 5.0.0"
+      version = ">= 3.53, < 5.0.0"
     }
   }