Upgrade to Kubernetes SDK to support 1.35

source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj

@@ -124,7 +124,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
     <PackageReference Include="NLog" Version="5.0.4" />
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
     <PackageReference Include="TaskScheduler" Version="2.7.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net8.0-windows'">

source/Octopus.Tentacle.Kubernetes.Tests.Integration/KubernetesClientCompatibilityTests.cs

@@ -21,10 +21,10 @@ public class KubernetesClientCompatibilityTests
 {
     static readonly object[] TestClusterVersions =
     [
+        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, 31)},
-        new object[] {new ClusterVersion(1, 30)},
     ];
 
     KubernetesTestsGlobalContext? testContext;

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-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\KindConfiguration\kind-config-v1-32.yaml">
+      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-34.yaml">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
-      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-33.yaml">
+      <EmbeddedResource Include="Setup\KindConfiguration\kind-config-v1-35.yaml">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </EmbeddedResource>
       <EmbeddedResource Include="Setup\linux-network-routing.yaml">

source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-32.yaml

@@ -3,6 +3,6 @@ apiVersion: kind.x-k8s.io/v1alpha4
 
 nodes:
   - role: control-plane
-    image: kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d
+    image: kindest/node:v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8
   - role: worker
-    image: kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d
+    image: kindest/node:v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8

source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-33.yaml

@@ -3,6 +3,6 @@ apiVersion: kind.x-k8s.io/v1alpha4
 
 nodes:
   - role: control-plane
-    image: kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f
+    image: kindest/node:v1.33.7@sha256:d26ef333bdb2cbe9862a0f7c3803ecc7b4303d8cea8e814b481b09949d353040
   - role: worker
-    image: kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f
+    image: kindest/node:v1.33.7@sha256:d26ef333bdb2cbe9862a0f7c3803ecc7b4303d8cea8e814b481b09949d353040

source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-34.yaml

@@ -0,0 +1,8 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.34.3@sha256:08497ee19eace7b4b5348db5c6a1591d7752b164530a36f855cb0f2bdcbadd48
+  - role: worker
+    image: kindest/node:v1.34.3@sha256:08497ee19eace7b4b5348db5c6a1591d7752b164530a36f855cb0f2bdcbadd48

source/Octopus.Tentacle.Kubernetes.Tests.Integration/Setup/KindConfiguration/kind-config-v1-35.yaml

@@ -0,0 +1,8 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f
+  - role: worker
+    image: kindest/node:v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f

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.18.6";
+    const string LatestVersion = "v3.19.2";
     public HelmDownloader( ILogger logger)
         : base("helm", logger)
     {

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.29.0";
+        const string LatestKindVersion = "v0.31.0";
 
         public KindDownloader(ILogger logger)
             : base("kind", logger)

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.33.5";
+    public const string LatestKubeCtlVersion = "v1.34.2";
 
     public KubeCtlDownloader(ILogger logger) 
         : base("kubectl", logger)

source/Octopus.Tentacle.Tests/Kubernetes/KubernetesEventMonitorFixture.cs

@@ -58,7 +58,7 @@ public async Task NoEntriesAreSentToMetricsWhenEventListIsEmpty()
             var agentMetrics = Substitute.For<IKubernetesAgentMetrics>();
             agentMetrics.GetLatestEventTimestamp(Arg.Any<CancellationToken>()).ReturnsForAnyArgs(testEpoch);
             var eventService = Substitute.For<IKubernetesEventService>();
-            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[]{new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper()}, log);
+            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[] { new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper() }, log);
 
             await sut.CacheNewEvents(tokenSource.Token);
 
@@ -72,20 +72,23 @@ public async Task NfsPodKillingEventsAreTrackedInMetrics()
             var agentMetrics = new StubbedAgentMetrics(testEpoch);
             var eventService = Substitute.For<IKubernetesEventService>();
             eventService.FetchAllEventsAsync(Arg.Any<string>(), Arg.Any<CancellationToken>()).ReturnsForAnyArgs(
-                new Corev1EventList(new List<Corev1Event>
+                new Corev1EventList
                 {
-                    new()
+                    Items = new List<Corev1Event>
                     {
-                        Reason = "Killing",
-                        Metadata = new V1ObjectMeta()
+                        new()
                         {
-                            Name = "octopus-agent-nfs-123412-1234123",
-                        },
-                        FirstTimestamp = testEpoch.DateTime.AddMinutes(1),
-                        LastTimestamp = testEpoch.DateTime.AddMinutes(1)
+                            Reason = "Killing",
+                            Metadata = new V1ObjectMeta()
+                            {
+                                Name = "octopus-agent-nfs-123412-1234123",
+                            },
+                            FirstTimestamp = testEpoch.DateTime.AddMinutes(1),
+                            LastTimestamp = testEpoch.DateTime.AddMinutes(1)
+                        }
                     }
-                }));
-            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[]{new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper()}, log);
+                });
+            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[] { new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper() }, log);
 
             //Act
             await sut.CacheNewEvents(tokenSource.Token);
@@ -105,21 +108,24 @@ public async Task NfsWatchDogEventsAreTrackedInMetrics()
             var agentMetrics = new StubbedAgentMetrics(testEpoch);
             var eventService = Substitute.For<IKubernetesEventService>();
             eventService.FetchAllEventsAsync(Arg.Any<string>(), Arg.Any<CancellationToken>()).ReturnsForAnyArgs(
-                new Corev1EventList(new List<Corev1Event>
+                new Corev1EventList
                 {
-                    new()
+                    Items = new List<Corev1Event>
                     {
-                        Reason = "NfsWatchdogTimeout",
-                        Metadata = new V1ObjectMeta()
+                        new()
                         {
-                            Name = podName,
-                        },
-                        FirstTimestamp = testEpoch.DateTime.AddSeconds(1),
-                        LastTimestamp = testEpoch.DateTime.AddSeconds(1)
+                            Reason = "NfsWatchdogTimeout",
+                            Metadata = new V1ObjectMeta()
+                            {
+                                Name = podName,
+                            },
+                            FirstTimestamp = testEpoch.DateTime.AddSeconds(1),
+                            LastTimestamp = testEpoch.DateTime.AddSeconds(1)
+                        }
                     }
-                }));
+                });
 
-            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[]{new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper()}, log);
+            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[] { new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper() }, log);
 
             //Act
             await sut.CacheNewEvents(tokenSource.Token);
@@ -139,24 +145,27 @@ public async Task EventsOlderThanOrEqualToMetricsTimestampCursorAreNotAddedToMet
             var agentMetrics = new StubbedAgentMetrics(testEpoch);
             var eventService = Substitute.For<IKubernetesEventService>();
             eventService.FetchAllEventsAsync(Arg.Any<string>(), Arg.Any<CancellationToken>()).ReturnsForAnyArgs(
-                new Corev1EventList(new List<Corev1Event>
+                new Corev1EventList
                 {
-                    new()
+                    Items = new List<Corev1Event>
                     {
-                        Reason = "NfsWatchdogTimeout",
-                        Metadata = new V1ObjectMeta()
+                        new()
                         {
-                            Name = podName,
-                        },
-                        FirstTimestamp = testEpoch.DateTime,
-                        LastTimestamp = testEpoch.DateTime
+                            Reason = "NfsWatchdogTimeout",
+                            Metadata = new V1ObjectMeta()
+                            {
+                                Name = podName,
+                            },
+                            FirstTimestamp = testEpoch.DateTime,
+                            LastTimestamp = testEpoch.DateTime
+                        }
                     }
-                }));
-            
-            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[]{new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper()}, log);
+                });
+
+            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[] { new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper() }, log);
             //Act
             await sut.CacheNewEvents(tokenSource.Token);
-            
+
             //Assert
             agentMetrics.Events.Should().BeEquivalentTo(new Dictionary<string, Dictionary<string, List<DateTimeOffset>>>());
         }
@@ -169,25 +178,28 @@ public async Task NewestTimeStampInEventIsUsedToDetermineAgeAndAsMetricsValue()
             var agentMetrics = new StubbedAgentMetrics(testEpoch);
             var eventService = Substitute.For<IKubernetesEventService>();
             eventService.FetchAllEventsAsync(Arg.Any<string>(), Arg.Any<CancellationToken>()).ReturnsForAnyArgs(
-                new Corev1EventList(new List<Corev1Event>
+                new Corev1EventList
                 {
-                    new()
+                    Items = new List<Corev1Event>
                     {
-                        Reason = "NfsWatchdogTimeout",
-                        Metadata = new V1ObjectMeta()
+                        new()
                         {
-                            Name = podName,
-                        },
-                        FirstTimestamp = testEpoch.DateTime.AddMinutes(-2),
-                        LastTimestamp = testEpoch.DateTime.AddMinutes(-1),
-                        EventTime = testEpoch.DateTime.AddMinutes(1)
+                            Reason = "NfsWatchdogTimeout",
+                            Metadata = new V1ObjectMeta()
+                            {
+                                Name = podName,
+                            },
+                            FirstTimestamp = testEpoch.DateTime.AddMinutes(-2),
+                            LastTimestamp = testEpoch.DateTime.AddMinutes(-1),
+                            EventTime = testEpoch.DateTime.AddMinutes(1)
+                        }
                     }
-                }));
-            
-            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[]{new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper()}, log);
+                });
+
+            var sut = new KubernetesEventMonitor(agentMetrics, eventService, "arbitraryNamespace", new IEventMapper[] { new NfsPodRestarted(), new TentacleKilledEventMapper(), new NfsStaleEventMapper() }, log);
             //Act
             await sut.CacheNewEvents(tokenSource.Token);
-            
+
             //Assert
             // The event.EventTime is newest event Time stamp, and is larger than the last metric date (TestEpoch) as such
             // the event should factored into the metrics, and should report this latest time value.

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(35, "latest")]
+        [TestCase(36, "latest")]
+        [TestCase(35, "1.35")]
         [TestCase(34, "1.34")]
         [TestCase(33, "1.33")]
         [TestCase(32, "1.32")]

source/Octopus.Tentacle.Tests/Kubernetes/KubernetesPodMonitorTests.cs

@@ -29,7 +29,7 @@ public void SetUp()
         {
             podService = Substitute.For<IKubernetesPodService>();
             log = new InMemoryLog();
-            clock = new FixedClock(new DateTimeOffset(2023,5,17,13,4,5, TimeSpan.Zero));
+            clock = new FixedClock(new DateTimeOffset(2023, 5, 17, 13, 4, 5, TimeSpan.Zero));
             monitor = new KubernetesPodMonitor(podService, log, new TentacleScriptLogProvider(), clock);
 
             scriptTicket = new ScriptTicket(Guid.NewGuid().ToString());
@@ -111,7 +111,7 @@ public async Task ExistingPodIsUpdatedWhenCompleted()
                     new()
                     {
                         Name = scriptTicket.ToKubernetesScriptPodName(),
-                        State = new V1ContainerState(terminated: new V1ContainerStateTerminated(0, finishedAt: DateTime.UtcNow))
+                        State = new V1ContainerState { Terminated = new V1ContainerStateTerminated { ExitCode = 0, FinishedAt = DateTime.UtcNow } }
                     }
                 }
             };

source/Octopus.Tentacle.Tests/Kubernetes/TrackedScriptPodFixture.cs

@@ -20,7 +20,7 @@ public class TrackedScriptPodFixture
         public void SetUp()
         {
             scriptTicket = new ScriptTicket("ScriptTicketId");
-            clock = new FixedClock(new DateTimeOffset(2023,5,17,13,4,5, TimeSpan.Zero));
+            clock = new FixedClock(new DateTimeOffset(2023, 5, 17, 13, 4, 5, TimeSpan.Zero));
             trackedPod = new TrackedScriptPod(scriptTicket, clock);
         }
 
@@ -29,8 +29,8 @@ public void NullStatus_Pending()
         {
             //Just changing the tracked Pod to a different state
             GetPodInRunningState();
-            
-            trackedPod.Update(new V1Pod(){ Metadata = new V1ObjectMeta(), Status = null});
+
+            trackedPod.Update(new V1Pod() { Metadata = new V1ObjectMeta(), Status = null });
             trackedPod.State.Phase.Should().Be(TrackedScriptPodPhase.Pending);
         }
 
@@ -39,11 +39,11 @@ public void NullContainerStatus_Pending()
         {
             //Just changing the tracked Pod to a different state
             GetPodInRunningState();
-            
-            trackedPod.Update(new V1Pod(){ Metadata = new V1ObjectMeta(), Status = new V1PodStatus(){ Phase = "Foo", ContainerStatuses = null}});
+
+            trackedPod.Update(new V1Pod() { Metadata = new V1ObjectMeta(), Status = new V1PodStatus() { Phase = "Foo", ContainerStatuses = null } });
             trackedPod.State.Phase.Should().Be(TrackedScriptPodPhase.Pending);
         }
-        
+
         [Test]
         public void ScriptContainerNotFound_Pending()
         {
@@ -58,7 +58,7 @@ public void ScriptContainerNotFound_Pending()
         public void CanTransitionFromPendingToRunning()
         {
             trackedPod.State.Phase.Should().Be(TrackedScriptPodPhase.Pending);
-            
+
             GetPodInRunningState();
         }
 
@@ -89,7 +89,7 @@ public void UpdateWithCompletedPodButNoFinishedAt(string podPhase, int exitCode,
             trackedPod.State.ExitCode.Should().Be(exitCode);
             trackedPod.State.FinishedAt.Should().Be(clock.GetUtcTime());
         }
-        
+
         [TestCase(0, TrackedScriptPodPhase.Succeeded)]
         [TestCase(123, TrackedScriptPodPhase.Failed)]
         public void MarkAsCompleted(int exitCode, TrackedScriptPodPhase expectedPhase)
@@ -130,7 +130,7 @@ public void PodUpdateAfterMarkAsCompleted_UpdatesToNewValue()
             trackedPod.State.ExitCode.Should().Be(podStatusExitCode);
             trackedPod.State.FinishedAt.Should().Be(podStatusFinishedAt);
         }
-        
+
         void GetPodInRunningState()
         {
             trackedPod.Update(CreateV1Pod(RunningContainerState()));
@@ -144,7 +144,6 @@ static V1ContainerState RunningContainerState()
         {
             return new V1ContainerState()
             {
-
                 Running = new V1ContainerStateRunning()
             };
         }
@@ -153,7 +152,6 @@ static V1ContainerState TerminatedContainerState(DateTime? finishedAt, int exitC
         {
             return new V1ContainerState()
             {
-
                 Terminated = new V1ContainerStateTerminated()
                 {
                     FinishedAt = finishedAt,
@@ -183,7 +181,7 @@ static V1Pod CreateV1Pod(V1ContainerStatus containerStatus)
                 }
             };
 
-            return new V1Pod(status: podStatus, metadata: new V1ObjectMeta());
+            return new V1Pod { Status = podStatus, Metadata = new V1ObjectMeta() };
         }
     }
 }