From 9411075fb276fe4c9c344deac6148562243726c8 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 24 Mar 2023 20:34:19 -0400 Subject: [PATCH 1/2] chore: Revert "pin workload_identity example to k8s 1.23 (#1315)" This reverts commit 59ca09ee14377f6c9f43698447af525b8f5853c7. --- examples/workload_identity/main.tf | 2 -- modules/workload-identity/README.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/examples/workload_identity/main.tf b/examples/workload_identity/main.tf index e63ba4e273..204e13b739 100644 --- a/examples/workload_identity/main.tf +++ b/examples/workload_identity/main.tf @@ -38,8 +38,6 @@ module "gke" { remove_default_node_pool = true service_account = "create" node_metadata = "GKE_METADATA" - # https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1313 - kubernetes_version = "1.23" node_pools = [ { name = "wi-pool" diff --git a/modules/workload-identity/README.md b/modules/workload-identity/README.md index 515aed5dff..da61430f63 100644 --- a/modules/workload-identity/README.md +++ b/modules/workload-identity/README.md @@ -14,8 +14,6 @@ The `terraform-google-workload-identity` can create service accounts for you, or you can use existing accounts; this applies for both the Google and Kubernetes accounts. -Note: This module currently supports Kubernetes <= 1.23. - ### Creating a Workload Identity ```hcl From 9bcfc39fb48a25edf28e1be4682fb380483f5e71 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 24 Mar 2023 20:41:37 -0400 Subject: [PATCH 2/2] fix: Require hashicorp/kubernetes 2.13+ to support Kubernetes 1.24 --- modules/workload-identity/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/workload-identity/versions.tf b/modules/workload-identity/versions.tf index 9a9e57bf9e..7df18d125e 100644 --- a/modules/workload-identity/versions.tf +++ b/modules/workload-identity/versions.tf @@ -25,7 +25,7 @@ terraform { } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 2.0" + version = "~> 2.13" } }