From 3d9355d1c74779b16a89ae0ae365f7839a726b75 Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Mon, 27 Apr 2026 10:25:42 +1000 Subject: [PATCH 1/2] Add k8s 1.36 container support and remove 1.32 testing --- .../KubernetesClientCompatibilityTests.cs | 3 +-- .../Octopus.Tentacle.Kubernetes.Tests.Integration.csproj | 3 --- .../Setup/KindConfiguration/kind-config-v1-32.yaml | 8 -------- .../Kubernetes/KubernetesPodContainerResolverTests.cs | 3 ++- 4 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-32.yaml diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs index 2ddb7b5e1..a0c6ae878 100644 --- a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs +++ b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs @@ -23,8 +23,7 @@ public class KubernetesClientCompatibilityTests [ new object[] {new ClusterVersion(1, 35)}, new object[] {new ClusterVersion(1, 34)}, - new object[] {new ClusterVersion(1, 33)}, - new object[] {new ClusterVersion(1, 32)}, + new object[] {new ClusterVersion(1, 33)} ]; KubernetesTestsGlobalContext? testContext; diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Octopus.Tentacle.Kubernetes.Tests.Integration.csproj b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Octopus.Tentacle.Kubernetes.Tests.Integration.csproj index fcf3ef07b..92656fcb8 100644 --- a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Octopus.Tentacle.Kubernetes.Tests.Integration.csproj +++ b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Octopus.Tentacle.Kubernetes.Tests.Integration.csproj @@ -57,9 +57,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-32.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-32.yaml deleted file mode 100644 index 43f348a5b..000000000 --- a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-32.yaml +++ /dev/null @@ -1,8 +0,0 @@ -kind: Cluster -apiVersion: kind.x-k8s.io/v1alpha4 - -nodes: - - role: control-plane - image: kindest/node:v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8 - - role: worker - image: kindest/node:v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8 diff --git a/source/Octopus.Tentacle.Tests/Kubernetes/KubernetesPodContainerResolverTests.cs b/source/Octopus.Tentacle.Tests/Kubernetes/KubernetesPodContainerResolverTests.cs index aaecef4cd..c5c2c2327 100644 --- a/source/Octopus.Tentacle.Tests/Kubernetes/KubernetesPodContainerResolverTests.cs +++ b/source/Octopus.Tentacle.Tests/Kubernetes/KubernetesPodContainerResolverTests.cs @@ -100,7 +100,8 @@ public async Task GetContainerImageForCluster_VersionMetadataExists_ClusterVersi result.Should().Be("octopusdeploy/kubernetes-agent-tools-base:latest"); } - [TestCase(36, "latest")] + [TestCase(37, "latest")] + [TestCase(36, "1.36")] [TestCase(35, "1.35")] [TestCase(34, "1.34")] [TestCase(33, "1.33")] From fb5e324330b6fcf3624f6d3aa402c07dcbd3c14a Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Mon, 27 Apr 2026 16:32:22 +1000 Subject: [PATCH 2/2] Actually update correct value --- .../Kubernetes/KubernetesPodContainerResolver.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesPodContainerResolver.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesPodContainerResolver.cs index 413a3286a..369bd50b9 100644 --- a/source/Octopus.Tentacle/Kubernetes/KubernetesPodContainerResolver.cs +++ b/source/Octopus.Tentacle/Kubernetes/KubernetesPodContainerResolver.cs @@ -37,6 +37,7 @@ public KubernetesPodContainerResolver(IKubernetesClusterService clusterService, new(1, 33), new(1, 34), new(1, 35), + new(1, 36), }; public async Task GetContainerImageForCluster()