Merge branch 'main' into em/add-concrete-authcontext-to-kubernetes-commands

eddymoulton · eddymoulton · commit c643e1459f3b · 2025-09-18T13:31:51.000+10:00
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs
@@ -21,10 +21,10 @@ public class KubernetesClientCompatibilityTests
 {
     static readonly object[] TestClusterVersions =
     [
+        new object[] {new ClusterVersion(1, 33)},
+        new object[] {new ClusterVersion(1, 32)},
         new object[] {new ClusterVersion(1, 31)},
         new object[] {new ClusterVersion(1, 30)},
-        new object[] {new ClusterVersion(1, 29)},
-        new object[] {new ClusterVersion(1, 28)},
     ];
 
     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
@@ -57,16 +57,16 @@
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
       <None Remove="Setup\teamcity-network-routing.yaml" />
-      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-28.yaml">
+      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-30.yaml">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
-      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-29.yaml">
+      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-31.yaml">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
-      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-30.yaml">
+      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-32.yaml">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
-      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-31.yaml">
+      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-33.yaml">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
       <EmbeddedResource Include="Setup\linux-network-routing.yaml">
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-28.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-28.yaml
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-29.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-29.yaml
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-30.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-30.yaml
@@ -3,6 +3,6 @@ apiVersion: kind.x-k8s.io/v1alpha4
 
 nodes:
   - role: control-plane
-    image: kindest/node:v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994
+    image: kindest/node:v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648
   - role: worker
-    image: kindest/node:v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994
+    image: kindest/node:v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-31.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-31.yaml
@@ -3,6 +3,6 @@ apiVersion: kind.x-k8s.io/v1alpha4
 
 nodes:
   - role: control-plane
-    image: kindest/node:v1.31.0@sha256:25a3504b2b340954595fa7a6ed1575ef2edadf5abd83c0776a4308b64bf47c93
+    image: kindest/node:v1.31.9@sha256:b94a3a6c06198d17f59cca8c6f486236fa05e2fb359cbd75dabbfc348a10b211
   - role: worker
-    image: kindest/node:v1.31.0@sha256:25a3504b2b340954595fa7a6ed1575ef2edadf5abd83c0776a4308b64bf47c93
+    image: kindest/node:v1.31.9@sha256:b94a3a6c06198d17f59cca8c6f486236fa05e2fb359cbd75dabbfc348a10b211
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
@@ -0,0 +1,8 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d
+  - role: worker
+    image: kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-33.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-33.yaml
@@ -0,0 +1,8 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f
+  - role: worker
+    image: kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KubernetesAgentInstaller.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KubernetesAgentInstaller.cs
@@ -121,6 +121,7 @@ string BuildAgentInstallArguments(string valuesFilePath, string? tentacleImageAn
             "upgrade",
             "--install",
             "--atomic",
+            "--timeout \"2m30s\"",
             $"-f \"{valuesFilePath}\"",
             GetImageAndRepository(tentacleImageAndTag),
             $"--version \"{chartVersion}\"",
@@ -138,7 +139,7 @@ static string GetChartVersion()
     {
         var customHelmChartVersion = Environment.GetEnvironmentVariable("KubernetesIntegrationTests_HelmChartVersion");
         
-        return !string.IsNullOrWhiteSpace(customHelmChartVersion) ? customHelmChartVersion : "1.*.*";
+        return !string.IsNullOrWhiteSpace(customHelmChartVersion) ? customHelmChartVersion : "2.*.*";
     }
 
     static string? GetImageAndRepository(string? tentacleImageAndTag)
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KubernetesClusterInstaller.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KubernetesClusterInstaller.cs
@@ -20,7 +20,7 @@ public class KubernetesClusterInstaller
     readonly string kubeCtlPath;
     readonly ILogger logger;
 
-    readonly ClusterVersion latestSupportedClusterVersion = new(1, 31);
+    readonly ClusterVersion latestSupportedClusterVersion = new(1, 33);
 
     public string KubeConfigPath => Path.Combine(tempDir.DirectoryPath, kubeConfigName);
     public string ClusterName => clusterName;
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/Tooling/HelmDownloader.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/Tooling/HelmDownloader.cs
@@ -9,7 +9,7 @@ namespace Octopus.Tentacle.Kubernetes.Tests.Integration.Setup.Tooling;
 
 public class HelmDownloader : ToolDownloader
 {
-    const string LatestVersion = "v3.16.3";
+    const string LatestVersion = "v3.18.6";
     public HelmDownloader( ILogger logger)
         : base("helm", logger)
     {
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/Tooling/KindDownloader.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/Tooling/KindDownloader.cs
@@ -6,7 +6,7 @@ namespace Octopus.Tentacle.Kubernetes.Tests.Integration.Setup.Tooling
 {
     public class KindDownloader : ToolDownloader
     {
-        const string LatestKindVersion = "v0.25.0";
+        const string LatestKindVersion = "v0.29.0";
 
         public KindDownloader(ILogger logger)
             : base("kind", logger)
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/Tooling/KubeCtlDownloader.cs b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/Tooling/KubeCtlDownloader.cs
@@ -4,7 +4,7 @@ namespace Octopus.Tentacle.Kubernetes.Tests.Integration.Setup.Tooling;
 
 public class KubeCtlDownloader : ToolDownloader
 {
-    public const string LatestKubeCtlVersion = "v1.30.6";
+    public const string LatestKubeCtlVersion = "v1.33.5";
     
     public KubeCtlDownloader(ILogger logger) 
         : base("kubectl", logger)
diff --git a/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/agent-values.yaml b/source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/agent-values.yaml
@@ -1,12 +1,17 @@
 agent:
   acceptEula: "Y"
-  targetName: "#{TargetName}"
+  name: "#{TargetName}"
   serverCommsAddress: "#{ServerCommsAddress}"
   serverUrl: "https://this.is.not.required.com/"
   bearerToken: "this-is-a-fake-bearer-token"
   space: "Default"
-  targetEnvironments: ["development"]
-  targetRoles: ["Testing Cluster", "another-testing-cluster"]
+  
+  deploymentTarget:
+    enabled: true
+    initial:
+      environments: ["development"]
+      tags: ["Testing Cluster", "another-testing-cluster"]
+      enabled: "true"
   
   image:
     repository: docker.packages.octopushq.com/octopusdeploy/kubernetes-agent-tentacle
diff --git 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(34, "latest")]
+        [TestCase(35, "latest")]
+        [TestCase(34, "1.34")]
         [TestCase(33, "1.33")]
         [TestCase(32, "1.32")]
         [TestCase(31, "1.31")]
diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesPodContainerResolver.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesPodContainerResolver.cs
@@ -35,6 +35,7 @@ public KubernetesPodContainerResolver(IKubernetesClusterService clusterService,
             new(1, 31),
             new(1, 32),
             new(1, 33),
+            new(1, 34),
         };
 
         public async Task<string> GetContainerImageForCluster()

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ public class KubernetesClientCompatibilityTests`
`21`	`21`	`{`
`22`	`22`	`static readonly object[] TestClusterVersions =`
`23`	`23`	`[`
	`24`	`+ new object[] {new ClusterVersion(1, 33)},`
	`25`	`+ new object[] {new ClusterVersion(1, 32)},`
`24`	`26`	`new object[] {new ClusterVersion(1, 31)},`
`25`	`27`	`new object[] {new ClusterVersion(1, 30)},`
`26`		`- new object[] {new ClusterVersion(1, 29)},`
`27`		`- new object[] {new ClusterVersion(1, 28)},`
`28`	`28`	`];`
`29`	`29`
`30`	`30`	`KubernetesTestsGlobalContext? testContext;`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ string BuildAgentInstallArguments(string valuesFilePath, string? tentacleImageAn`
`121`	`121`	`"upgrade",`
`122`	`122`	`"--install",`
`123`	`123`	`"--atomic",`
	`124`	`+ "--timeout \"2m30s\"",`
`124`	`125`	`$"-f \"{valuesFilePath}\"",`
`125`	`126`	`GetImageAndRepository(tentacleImageAndTag),`
`126`	`127`	`$"--version \"{chartVersion}\"",`
`@@ -138,7 +139,7 @@ static string GetChartVersion()`
`138`	`139`	`{`
`139`	`140`	`var customHelmChartVersion = Environment.GetEnvironmentVariable("KubernetesIntegrationTests_HelmChartVersion");`
`140`	`141`
`141`		`- return !string.IsNullOrWhiteSpace(customHelmChartVersion) ? customHelmChartVersion : "1..";`
	`142`	`+ return !string.IsNullOrWhiteSpace(customHelmChartVersion) ? customHelmChartVersion : "2..";`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`static string? GetImageAndRepository(string? tentacleImageAndTag)`