From b8fb6d1296c9c0cd3ec9376151bdedc7b59c5546 Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Wed, 7 Jun 2023 17:57:20 +0000 Subject: [PATCH 1/3] backport of commit 41dc1c961d32155eeefb3b0e1e70ed66308ed752 --- charts/consul/test/terraform/aks/main.tf | 2 +- charts/consul/test/terraform/gke/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/consul/test/terraform/aks/main.tf b/charts/consul/test/terraform/aks/main.tf index bf8c925f15..2683bdc1a7 100644 --- a/charts/consul/test/terraform/aks/main.tf +++ b/charts/consul/test/terraform/aks/main.tf @@ -55,7 +55,7 @@ resource "azurerm_kubernetes_cluster" "default" { location = azurerm_resource_group.default[count.index].location resource_group_name = azurerm_resource_group.default[count.index].name dns_prefix = "consul-k8s-${random_id.suffix[count.index].dec}" - kubernetes_version = "1.26" + kubernetes_version = "1.24.10" role_based_access_control_enabled = true // We're setting the network plugin and other network properties explicitly diff --git a/charts/consul/test/terraform/gke/main.tf b/charts/consul/test/terraform/gke/main.tf index fe5adc5e8d..34bb07906f 100644 --- a/charts/consul/test/terraform/gke/main.tf +++ b/charts/consul/test/terraform/gke/main.tf @@ -21,7 +21,7 @@ resource "random_id" "suffix" { data "google_container_engine_versions" "main" { location = var.zone - version_prefix = "1.25." + version_prefix = "1.25.9" } # We assume that the subnets are already created to save time. From 1f895318dbae8ad645e8d1ef1a25f5a8faca5487 Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Wed, 7 Jun 2023 17:57:45 +0000 Subject: [PATCH 2/3] backport of commit 87a39c17759e3d34ecf4bcc3a158e64b2ecd4da6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d3a3733ab..d43a12b455 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,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.23.x - 1.26.x** - This represents the earliest versions of Kubernetes tested. + * **Kubernetes 1.24.x - 1.27.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 From f9bf28b6f5639ef4aae3c6e504f983d9b1dfa3cb Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Wed, 7 Jun 2023 17:57:55 +0000 Subject: [PATCH 3/3] backport of commit df46c2e7e5be8e06f8571a4f7125887f9314ec89 --- .changelog/2304.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2304.txt diff --git a/.changelog/2304.txt b/.changelog/2304.txt new file mode 100644 index 0000000000..c977da5acd --- /dev/null +++ b/.changelog/2304.txt @@ -0,0 +1,3 @@ +```release-note:improvement +helm: Kubernetes v1.27 is now supported. Minimum tested version of Kubernetes is now v1.24. +```