From afdc0cd559415f3fc27c507808fd57e31e67f12e Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Tue, 30 Jun 2026 10:39:31 +1000 Subject: [PATCH 1/2] Upgrade static clusters to 1.34 --- .../KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf | 2 +- .../KubernetesFixtures/Terraform/StaticClusters/EKS/eks.tf | 2 +- .../KubernetesFixtures/Terraform/StaticClusters/GKE/gke.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf index 29f0cda332..db9209e61a 100644 --- a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf +++ b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf @@ -38,7 +38,7 @@ resource "azurerm_kubernetes_cluster" "local_access_disabled" { resource_group_name = azurerm_resource_group.default.name location = "Australia East" dns_prefix = "${var.static_resource_prefix}-k8s-no-local" - kubernetes_version = "1.32" + kubernetes_version = "1.34" tags = { octopus-project = "aks-static-no-local" diff --git a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/EKS/eks.tf b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/EKS/eks.tf index 63104176ef..41cde6b10a 100644 --- a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/EKS/eks.tf +++ b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/EKS/eks.tf @@ -74,7 +74,7 @@ resource "aws_eks_node_group" "default" { resource "aws_eks_cluster" "default" { name = "${var.static_resource_prefix}-eks" role_arn = aws_iam_role.cluster.arn - version = "1.32" + version = "1.34" tags = { octopus-environment = "Staging" diff --git a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/GKE/gke.tf b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/GKE/gke.tf index ab4afacfdc..a1f44fd71b 100644 --- a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/GKE/gke.tf +++ b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/GKE/gke.tf @@ -5,7 +5,7 @@ data "google_container_engine_versions" "main" { # Since this is just a string match, it's recommended that you append a . after minor versions # to ensure that prefixes such as 1.1 don't match versions like 1.12.5-gke.10 accidentally. - version_prefix = "1.32." + version_prefix = "1.34." } # VPC From 90496a77bc0007d393af9cd478ee0c9acf909727 Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Tue, 30 Jun 2026 10:55:45 +1000 Subject: [PATCH 2/2] Add missing version bump --- .../KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf index db9209e61a..eca03d7f48 100644 --- a/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf +++ b/source/Calamari.Tests/KubernetesFixtures/Terraform/StaticClusters/AKS/aks.tf @@ -8,7 +8,7 @@ resource "azurerm_kubernetes_cluster" "default" { resource_group_name = azurerm_resource_group.default.name location = "Australia East" dns_prefix = "${var.static_resource_prefix}-k8s" - kubernetes_version = "1.32" + kubernetes_version = "1.34" tags = { octopus-project = "aks-static"