bump terraform and tweak dependabot config (#1213)

* bump terraform and tweak dependabot config Signed-off-by: Bob Callaway <[email protected]> * bump action version Signed-off-by: Bob Callaway <[email protected]> --------- Signed-off-by: Bob Callaway <[email protected]>
sigstore · Aug 7, 2024 · a8b6af3 · a8b6af3
1 parent 83b5751
commit a8b6af3
Show file tree

Hide file tree

Showing 28 changed files with 62 additions and 103 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,65 +1,24 @@
 version: 2
 updates:
 - package-ecosystem: docker
-  directory: "/"
-  schedule:
-    interval: daily
-- package-ecosystem: docker
-  directory: "/config/fulcio/fulcio"
-  schedule:
-    interval: daily
-- package-ecosystem: docker
-  directory: "/config/rekor/rekor"
-  schedule:
-    interval: daily
-- package-ecosystem: docker
-  directory: "/config/trillian/trillian-log-server"
-  schedule:
-    interval: daily
-- package-ecosystem: docker
-  directory: "/config/trillian/trillian-log-signer"
-  schedule:
-    interval: daily
-- package-ecosystem: docker
-  directory: "/config/tsa/tsa"
-  schedule:
-    interval: daily
+  directories:
+    - "/"
+    - "/config/**/*"
+
 - package-ecosystem: gomod
   directory: "/"
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
+
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
     interval: weekly
 
 - package-ecosystem: "terraform"
-  directory: "/terraform/gcp/modules/argocd"
-  schedule:
-    interval: monthly
-  groups:
-    terraform:
-      patterns:
-        - "*"
-- package-ecosystem: "terraform"
-  directory: "/terraform/gcp/modules/external_secrets"
-  schedule:
-    interval: monthly
-  groups:
-    terraform:
-      patterns:
-        - "*"
-- package-ecosystem: "terraform"
-  directory: "/terraform/gcp/modules/monitoring/slo"
-  schedule:
-    interval: monthly
-  groups:
-    terraform:
-      patterns:
-        - "*"
-- package-ecosystem: "terraform"
-  directory: "/terraform/gcp/modules/sigstore"
+  directories:
+    - "/terraform/gcp/modules/**/*"
   schedule:
     interval: monthly
   groups:

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.9.3
+          terraform_version: 1.9.4
 
       - name: Terraform fmt
         id: fmt
@@ -46,7 +46,7 @@ jobs:
       - uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.9.3
+          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.3"
+  required_version = "1.9.4"
 
   required_providers {
     kubectl = {

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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.39.1"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     kubectl = {

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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     google-beta = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
   }

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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.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.3"
+  required_version = "1.9.4"
 
   required_providers {
     google = {
-      version = "5.38.0"
+      version = "5.40.0"
       source  = "hashicorp/google"
     }
     random = {