fix: revert and add provider constraint

terraform-google-modules · Sep 20, 2024 · 3d8f0be · 3d8f0be
1 parent c9589a6
commit 3d8f0be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/examples/oidc-simple/main.tf b/examples/oidc-simple/main.tf
@@ -30,10 +30,9 @@ module "oidc" {
   source  = "terraform-google-modules/github-actions-runners/google//modules/gh-oidc"
   version = "~> 3.0"
 
-  project_id          = var.project_id
-  pool_id             = "example-pool"
-  provider_id         = "example-gh-provider"
-  attribute_condition = "assertion.repository_owner_id=='1342004'"
+  project_id  = var.project_id
+  pool_id     = "example-pool"
+  provider_id = "example-gh-provider"
   sa_mapping = {
     (google_service_account.sa.account_id) = {
       sa_name   = google_service_account.sa.name

diff --git a/modules/gh-runner-gke/main.tf b/modules/gh-runner-gke/main.tf
@@ -46,13 +46,12 @@ resource "google_compute_subnetwork" "gh-subnetwork" {
     ip_cidr_range = var.ip_range_services_cider
   }
 }
-
 /*****************************************
   Runner GKE
  *****************************************/
 module "runner-cluster" {
   source                   = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster/"
-  version                  = "~> 33.0"
+  version                  = "~> 32.0"
   project_id               = var.project_id
   name                     = "gh-runner-${var.cluster_suffix}"
   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 = ">= 4.3.0, < 7"
+      version = ">= 4.3.0, < 6.2"
     }
 
     kubernetes = {