Revert "Bump the terraform group across 27 directories with 2 updates (…

…#1248)" This reverts commit 8f819eb.
sigstore · Sep 17, 2024 · 1568e9b · 1568e9b
1 parent c805d27
commit 1568e9b
Show file tree

Hide file tree

Showing 29 changed files with 61 additions and 57 deletions.
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.9.5
+          terraform_version: 1.9.4
 
       - name: Terraform fmt
         id: fmt
@@ -46,7 +46,7 @@ jobs:
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.9.5
+          terraform_version: 1.9.4
 
       - name: Terraform init
         id: init

diff --git a/terraform/gcp/modules/argocd/versions.tf b/terraform/gcp/modules/argocd/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     kubectl = {
@@ -24,7 +24,7 @@ terraform {
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.15.0"
+      version = "2.14.1"
     }
   }
 }
diff --git a/terraform/gcp/modules/audit/versions.tf b/terraform/gcp/modules/audit/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/bastion/versions.tf b/terraform/gcp/modules/bastion/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     random = {

diff --git a/terraform/gcp/modules/ca/versions.tf b/terraform/gcp/modules/ca/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/ctlog/versions.tf b/terraform/gcp/modules/ctlog/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/dex/versions.tf b/terraform/gcp/modules/dex/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/external_secrets/versions.tf b/terraform/gcp/modules/external_secrets/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     kubectl = {
@@ -28,7 +28,7 @@ terraform {
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.15.0"
+      version = "2.14.1"
     }
   }
 }
diff --git a/terraform/gcp/modules/fulcio/versions.tf b/terraform/gcp/modules/fulcio/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/gke_cluster/versions.tf b/terraform/gcp/modules/gke_cluster/versions.tf
@@ -15,15 +15,15 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     google-beta = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google-beta"
     }
     random = {

diff --git a/terraform/gcp/modules/monitoring/dex/versions.tf b/terraform/gcp/modules/monitoring/dex/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/monitoring/fulcio/versions.tf b/terraform/gcp/modules/monitoring/fulcio/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/monitoring/infra/versions.tf b/terraform/gcp/modules/monitoring/infra/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/monitoring/prober/versions.tf b/terraform/gcp/modules/monitoring/prober/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/monitoring/rekor/versions.tf b/terraform/gcp/modules/monitoring/rekor/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/monitoring/slo/versions.tf b/terraform/gcp/modules/monitoring/slo/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/monitoring/versions.tf b/terraform/gcp/modules/monitoring/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/mysql-shard/mysql.tf b/terraform/gcp/modules/mysql-shard/mysql.tf
@@ -39,6 +39,7 @@ resource "google_sql_database_instance" "trillian" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
+      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 
@@ -79,6 +80,7 @@ resource "google_sql_database_instance" "read_replica" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
+      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 

diff --git a/terraform/gcp/modules/mysql-shard/versions.tf b/terraform/gcp/modules/mysql-shard/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/mysql/mysql.tf b/terraform/gcp/modules/mysql/mysql.tf
@@ -125,6 +125,7 @@ resource "google_sql_database_instance" "sigstore" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
+      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 
@@ -172,6 +173,7 @@ resource "google_sql_database_instance" "read_replica" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
+      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 

diff --git a/terraform/gcp/modules/mysql/versions.tf b/terraform/gcp/modules/mysql/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     random = {

diff --git a/terraform/gcp/modules/network/versions.tf b/terraform/gcp/modules/network/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/oslogin/versions.tf b/terraform/gcp/modules/oslogin/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/project_roles/versions.tf b/terraform/gcp/modules/project_roles/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

diff --git a/terraform/gcp/modules/redis/versions.tf b/terraform/gcp/modules/redis/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     random = {

diff --git a/terraform/gcp/modules/rekor/versions.tf b/terraform/gcp/modules/rekor/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.5"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "6.2.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }