From 149448dbb3e4aba80f3d5def47f6c6608e0a558c Mon Sep 17 00:00:00 2001
From: Curt Bushko <cbushko@gmail.com>
Date: Mon, 30 Oct 2023 15:55:19 -0400
Subject: [PATCH] test 1.25 to 1.28

---
 .changelog/3138.txt                           | 2 +-
 .github/workflows/nightly-acceptance.yml      | 9 +++------
 README.md                                     | 2 +-
 charts/consul/test/terraform/aks/variables.tf | 2 +-
 charts/consul/test/terraform/eks/main.tf      | 2 +-
 charts/consul/test/terraform/gke/main.tf      | 4 ++--
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.changelog/3138.txt b/.changelog/3138.txt
index e79382f360..2eefd6b616 100644
--- a/.changelog/3138.txt
+++ b/.changelog/3138.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
-helm: Kubernetes v1.28 is now supported. Minimum tested version of Kubernetes is now v1.26.
+helm: Kubernetes v1.28 is now supported. Minimum tested version of Kubernetes is now v1.25.
 ```
diff --git a/.github/workflows/nightly-acceptance.yml b/.github/workflows/nightly-acceptance.yml
index 6db7684bb8..e508a3872c 100644
--- a/.github/workflows/nightly-acceptance.yml
+++ b/.github/workflows/nightly-acceptance.yml
@@ -1,14 +1,11 @@
 # Dispatch to the consul-k8s-workflows with a nightly cron
 name: nightly-acceptance
 on:
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    # Run nightly at 12AM UTC/8PM EST/5PM PST
-    - cron:  '0 0 * * *'
+  pull_request:
 
-# these should be the only settings that you will ever need to change
+  # these should be the only settings that you will ever need to change
 env:
-  BRANCH: ${{ github.ref_name }}
+  BRANCH: ${{ github.head_ref || github.ref_name }}
   CONTEXT: "nightly"
 
 jobs:
diff --git a/README.md b/README.md
index a52b2bcbf7..52e909741b 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ by contacting us at [security@hashicorp.com](mailto:security@hashicorp.com).
 
 The following pre-requisites must be met before installing Consul on Kubernetes. 
 
-  * **Kubernetes 1.24.x - 1.27.x** - This represents the earliest versions of Kubernetes tested.
+  * **Kubernetes 1.25.x - 1.28.x** - This represents the earliest versions of Kubernetes tested.
     It is possible that this chart works with earlier versions, but it is
     untested.
   * Helm install
diff --git a/charts/consul/test/terraform/aks/variables.tf b/charts/consul/test/terraform/aks/variables.tf
index 306532f85c..bb8d48251a 100644
--- a/charts/consul/test/terraform/aks/variables.tf
+++ b/charts/consul/test/terraform/aks/variables.tf
@@ -7,7 +7,7 @@ variable "location" {
 }
 
 variable "kubernetes_version" {
-  default     = "1.26"
+  default     = "1.25"
   description = "Kubernetes version supported on AKS"
 }
 
diff --git a/charts/consul/test/terraform/eks/main.tf b/charts/consul/test/terraform/eks/main.tf
index 739d4a5839..3bc8b40451 100644
--- a/charts/consul/test/terraform/eks/main.tf
+++ b/charts/consul/test/terraform/eks/main.tf
@@ -68,7 +68,7 @@ module "eks" {
   kubeconfig_api_version = "client.authentication.k8s.io/v1beta1"
 
   cluster_name    = "consul-k8s-${random_id.suffix[count.index].dec}"
-  cluster_version = "1.27"
+  cluster_version = "1.26"
   subnets         = module.vpc[count.index].private_subnets
   enable_irsa     = true
 
diff --git a/charts/consul/test/terraform/gke/main.tf b/charts/consul/test/terraform/gke/main.tf
index 2bec2c6dde..14c86e4ea9 100644
--- a/charts/consul/test/terraform/gke/main.tf
+++ b/charts/consul/test/terraform/gke/main.tf
@@ -41,8 +41,8 @@ resource "google_container_cluster" "cluster" {
   # 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"
+  min_master_version = "1.27.3-gke.100"
+  node_version       = "1.27.3-gke.100"
   node_config {
     tags         = ["consul-k8s-${random_id.suffix[count.index].dec}"]
     machine_type = "e2-standard-8"