feat!: update tf providers and modules (#101)

terraform-google-modules · Jul 1, 2022 · a92318f · a92318f
1 parent f1eae45
commit a92318f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/main.tf b/main.tf
@@ -32,10 +32,9 @@ resource "random_id" "suffix" {
   byte_length = 4
 }
 
-
 module "gke_auth" {
   source  = "terraform-google-modules/kubernetes-engine/google//modules/auth"
-  version = "~> 10.0"
+  version = "~> 21.0"
 
   project_id   = module.project_services.project_id
   cluster_name = module.gke.name
@@ -46,16 +45,13 @@ module "gke_auth" {
 
 provider "helm" {
   kubernetes {
-    load_config_file       = false
     cluster_ca_certificate = module.gke_auth.cluster_ca_certificate
     host                   = module.gke_auth.host
     token                  = module.gke_auth.token
   }
 }
 
 provider "kubernetes" {
-  load_config_file = false
-
   cluster_ca_certificate = module.gke_auth.cluster_ca_certificate
   host                   = module.gke_auth.host
   token                  = module.gke_auth.token
@@ -64,7 +60,7 @@ provider "kubernetes" {
 // Services
 module "project_services" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 11.0"
+  version = "~> 13.0"
 
   project_id                  = var.project_id
   disable_services_on_destroy = false
@@ -248,7 +244,7 @@ resource "google_storage_bucket" "gitlab-runner-cache" {
 // GKE Cluster
 module "gke" {
   source  = "terraform-google-modules/kubernetes-engine/google"
-  version = "~> 12.0"
+  version = "~> 21.0"
 
   # Create an implicit dependency on service activation
   project_id = module.project_services.project_id

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -16,13 +16,14 @@
 
 module "gke-gitlab-proj" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 11.0"
+  version = "~> 13.0"
 
-  name              = "ci-gitlab"
-  random_project_id = true
-  org_id            = var.org_id
-  folder_id         = var.folder_id
-  billing_account   = var.billing_account
+  name                        = "ci-gitlab"
+  random_project_id           = true
+  org_id                      = var.org_id
+  folder_id                   = var.folder_id
+  billing_account             = var.billing_account
+  disable_services_on_destroy = false
 
   auto_create_network = true
 

diff --git a/versions.tf b/versions.tf
@@ -27,11 +27,11 @@ terraform {
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 1.2.0"
+      version = "~> 2.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.11.0"
+      version = "~> 2.0"
     }
     null = {
       source  = "hashicorp/null"