Remove unused code

OctopusDeploy · Dec 15, 2023 · 6b7c444 · 6b7c444
1 parent 3760e03
commit 6b7c444
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 57 deletions.
diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesJobService.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesJobService.cs
@@ -1,17 +1,14 @@
 using System;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using k8s;
-using k8s.Autorest;
 using k8s.Models;
 using Octopus.Tentacle.Contracts;
 
 namespace Octopus.Tentacle.Kubernetes
 {
     public interface IKubernetesJobService
     {
-        Task<V1Job?> TryGet(ScriptTicket scriptTicket, CancellationToken cancellationToken);
         string BuildJobName(ScriptTicket scriptTicket);
         Task CreateJob(V1Job job, CancellationToken cancellationToken);
         Task Delete(ScriptTicket scriptTicket, CancellationToken cancellationToken);
@@ -26,21 +23,6 @@ public KubernetesJobService(IKubernetesClientConfigProvider configProvider)
         {
         }
 
-        public async Task<V1Job?> TryGet(ScriptTicket scriptTicket, CancellationToken cancellationToken)
-        {
-            var jobName = BuildJobName(scriptTicket);
-
-            try
-            {
-                return await Client.ReadNamespacedJobStatusAsync(jobName, KubernetesConfig.Namespace, cancellationToken: cancellationToken);
-            }
-            catch (HttpOperationException opException)
-                when (opException.Response.StatusCode == HttpStatusCode.NotFound)
-            {
-                return null;
-            }
-        }
-
         public async Task SuspendJob(ScriptTicket scriptTicket, CancellationToken cancellationToken)
         {
             var jobName = BuildJobName(scriptTicket);

diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesModule.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesModule.cs
@@ -8,7 +8,6 @@ protected override void Load(ContainerBuilder builder)
         {
             builder.RegisterType<KubernetesJobService>().As<IKubernetesJobService>().SingleInstance();
             builder.RegisterType<KubernetesClusterService>().As<IKubernetesClusterService>().SingleInstance();
-            builder.RegisterType<KubernetesPodService>().As<IKubernetesPodService>().SingleInstance();
             builder.RegisterType<KubernetesJobContainerResolver>().As<IKubernetesJobContainerResolver>().SingleInstance();
 
 #if DEBUG

diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesPodService.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesPodService.cs
diff --git a/source/Octopus.Tentacle/Kubernetes/Scripts/KubernetesJobScriptExecutor.cs b/source/Octopus.Tentacle/Kubernetes/Scripts/KubernetesJobScriptExecutor.cs
@@ -11,15 +11,13 @@ namespace Octopus.Tentacle.Kubernetes.Scripts
     public class KubernetesJobScriptExecutor : IScriptExecutor
     {
         readonly IKubernetesJobService jobService;
-        readonly IKubernetesPodService podService;
         readonly IKubernetesJobContainerResolver containerResolver;
         readonly IApplicationInstanceSelector appInstanceSelector;
         readonly ISystemLog log;
 
-        public KubernetesJobScriptExecutor(IKubernetesJobService jobService, IKubernetesPodService podService, IKubernetesJobContainerResolver containerResolver, IApplicationInstanceSelector appInstanceSelector, ISystemLog log)
+        public KubernetesJobScriptExecutor(IKubernetesJobService jobService, IKubernetesJobContainerResolver containerResolver, IApplicationInstanceSelector appInstanceSelector, ISystemLog log)
         {
             this.jobService = jobService;
-            this.podService = podService;
             this.containerResolver = containerResolver;
             this.appInstanceSelector = appInstanceSelector;
             this.log = log;
@@ -29,7 +27,7 @@ public KubernetesJobScriptExecutor(IKubernetesJobService jobService, IKubernetes
 
         public IRunningScript ExecuteOnBackgroundThread(StartScriptCommandV3Alpha command, IScriptWorkspace workspace, ScriptStateStore scriptStateStore, CancellationToken cancellationToken)
         {
-            var runningScript = new RunningKubernetesJob(workspace, workspace.CreateLog(), command.ScriptTicket, command.TaskId, log, scriptStateStore, jobService, podService, containerResolver, appInstanceSelector, cancellationToken);
+            var runningScript = new RunningKubernetesJob(workspace, workspace.CreateLog(), command.ScriptTicket, command.TaskId, log, scriptStateStore, jobService, containerResolver, appInstanceSelector, cancellationToken);
 
             Task.Run(() => runningScript.Execute(), cancellationToken);
 

diff --git a/source/Octopus.Tentacle/Kubernetes/Scripts/RunningKubernetesJob.cs b/source/Octopus.Tentacle/Kubernetes/Scripts/RunningKubernetesJob.cs
@@ -32,7 +32,6 @@ public class RunningKubernetesJob : IRunningScript
         readonly ILog log;
         readonly IScriptStateStore stateStore;
         readonly IKubernetesJobService jobService;
-        readonly IKubernetesPodService podService;
         readonly IKubernetesJobContainerResolver containerResolver;
         CancellationToken scriptCancellationToken;
         readonly string? instanceName;
@@ -51,7 +50,6 @@ public RunningKubernetesJob(
             ILog log,
             IScriptStateStore stateStore,
             IKubernetesJobService jobService,
-            IKubernetesPodService podService,
             IKubernetesJobContainerResolver containerResolver,
             IApplicationInstanceSelector appInstanceSelector,
             CancellationToken scriptCancellationToken)
@@ -62,7 +60,6 @@ public RunningKubernetesJob(
             this.log = log;
             this.stateStore = stateStore;
             this.jobService = jobService;
-            this.podService = podService;
             this.containerResolver = containerResolver;
             this.scriptCancellationToken = scriptCancellationToken;
             ScriptLog = scriptLog;