From 6789bccba20101096c856a2bb9cc11135aeb53e9 Mon Sep 17 00:00:00 2001
From: Curt Bushko <cbushko@gmail.com>
Date: Thu, 26 Oct 2023 14:17:33 -0400
Subject: [PATCH] Update kind to 1.28.0

Hardcode GKE version for now
---
 .github/workflows/pr.yml                    |  2 +-
 acceptance/ci-inputs/kind-inputs.yaml       |  2 +-
 charts/consul/test/terraform/gke/main.tf    | 17 +++++++++++++----
 charts/consul/test/terraform/gke/outputs.tf |  4 ++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 38c4c368ae..2959554e21 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -19,6 +19,6 @@ jobs:
       with:
         workflow: test.yml
         repo: hashicorp/consul-k8s-workflows
-        ref: mw/1-18-parallel-tproxy
+        ref: main
         token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
         inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
diff --git a/acceptance/ci-inputs/kind-inputs.yaml b/acceptance/ci-inputs/kind-inputs.yaml
index ba21d2cdaf..9b047bdac6 100644
--- a/acceptance/ci-inputs/kind-inputs.yaml
+++ b/acceptance/ci-inputs/kind-inputs.yaml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MPL-2.0
 
 kindVersion: v0.19.0
-kindNodeImage: kindest/node:v1.27.1
+kindNodeImage: kindest/node:v1.28.0@sha256:dad5a6238c5e41d7cac405fae3b5eda2ad1de6f1190fa8bfc64ff5bb86173213
 kubectlVersion: v1.27.1
diff --git a/charts/consul/test/terraform/gke/main.tf b/charts/consul/test/terraform/gke/main.tf
index 34bb07906f..2bec2c6dde 100644
--- a/charts/consul/test/terraform/gke/main.tf
+++ b/charts/consul/test/terraform/gke/main.tf
@@ -4,7 +4,7 @@
 terraform {
   required_providers {
     google = {
-      version = "~> 4.58.0"
+      version = "~> 5.3.0"
     }
   }
 }
@@ -21,7 +21,7 @@ resource "random_id" "suffix" {
 
 data "google_container_engine_versions" "main" {
   location       = var.zone
-  version_prefix = "1.25.9"
+  version_prefix = "1.28."
 }
 
 # We assume that the subnets are already created to save time.
@@ -37,14 +37,23 @@ resource "google_container_cluster" "cluster" {
   project            = var.project
   initial_node_count = 3
   location           = var.zone
-  min_master_version = data.google_container_engine_versions.main.latest_master_version
-  node_version       = data.google_container_engine_versions.main.latest_master_version
+  # 2023-10-30 - There is a bug with the terraform provider where lastest_master_version is not being returned by the
+  # api. Hardcode GKE version for now.
+  #min_master_version = data.google_container_engine_versions.main.latest_master_version
+  #node_version       = data.google_container_engine_versions.main.latest_master_version
+  min_master_version = "1.28.2-gke.1157000"
+  node_version       = "1.28.2-gke.1157000"
   node_config {
     tags         = ["consul-k8s-${random_id.suffix[count.index].dec}"]
     machine_type = "e2-standard-8"
   }
   subnetwork      = data.google_compute_subnetwork.subnet.name
   resource_labels = var.labels
+
+  release_channel {
+    channel = "RAPID"
+  }
+  deletion_protection = false
 }
 
 resource "google_compute_firewall" "firewall-rules" {
diff --git a/charts/consul/test/terraform/gke/outputs.tf b/charts/consul/test/terraform/gke/outputs.tf
index a0ffac907f..b1c1343e9e 100644
--- a/charts/consul/test/terraform/gke/outputs.tf
+++ b/charts/consul/test/terraform/gke/outputs.tf
@@ -12,3 +12,7 @@ output "cluster_names" {
 output "kubeconfigs" {
   value = [for cl in google_container_cluster.cluster : format("$HOME/.kube/%s", cl.name)]
 }
+
+output "versions" {
+  value = data.google_container_engine_versions.main
+}