Cleanup of kubernetesWorkflow assembly.

Framework/Core/CoreInterface.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace Core
 {

Framework/KubernetesWorkflow/K8sCluster.cs

@@ -54,16 +54,4 @@ namespace KubernetesWorkflow
             }
         }
     }
-
-    public class K8sNodeLabel
-    {
-        public K8sNodeLabel(string key, string value)
-        {
-            Key = key;
-            Value = value;
-        }
-
-        public string Key { get; }
-        public string Value { get; }
-    }
 }

Framework/KubernetesWorkflow/K8sController.cs

@@ -1,5 +1,7 @@
 using k8s;
 using k8s.Models;
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
 using Logging;
 using Utils;
 

Framework/KubernetesWorkflow/K8sHooks.cs

@@ -1,4 +1,7 @@
-namespace KubernetesWorkflow
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
+
+namespace KubernetesWorkflow
 {
     public interface IK8sHooks
     {

Framework/KubernetesWorkflow/Location.cs

@@ -1,4 +1,6 @@
-namespace KubernetesWorkflow
+using KubernetesWorkflow.Types;
+
+namespace KubernetesWorkflow
 {
     public interface ILocation
     {

Framework/KubernetesWorkflow/LocationProvider.cs

@@ -1,4 +1,5 @@
-using Logging;
+using KubernetesWorkflow.Types;
+using Logging;
 
 namespace KubernetesWorkflow
 {

Framework/KubernetesWorkflow/LogHandler.cs

@@ -0,0 +1,23 @@
+namespace KubernetesWorkflow
+{
+    public interface ILogHandler
+    {
+        void Log(Stream log);
+    }
+
+    public abstract class LogHandler : ILogHandler
+    {
+        public void Log(Stream log)
+        {
+            using var reader = new StreamReader(log);
+            var line = reader.ReadLine();
+            while (line != null)
+            {
+                ProcessLine(line);
+                line = reader.ReadLine();
+            }
+        }
+
+        protected abstract void ProcessLine(string line);
+    }
+}

Framework/KubernetesWorkflow/Recipe/ContainerAdditionals.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json.Linq;
 
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public class ContainerAdditionals
     {
@@ -20,7 +20,7 @@ namespace KubernetesWorkflow
         {
             var typeName = GetTypeName(typeof(T));
             var userData = Additionals.SingleOrDefault(a => a.Type == typeName);
-            if (userData == null) return default(T);
+            if (userData == null) return default;
             var jobject = (JObject)userData.UserData;
             return jobject.ToObject<T>();
         }

Framework/KubernetesWorkflow/Recipe/ContainerRecipe.cs

@@ -1,4 +1,4 @@
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public class ContainerRecipe
     {

Framework/KubernetesWorkflow/Recipe/ContainerRecipeFactory.cs

@@ -1,6 +1,6 @@
 using Utils;
 
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public abstract class ContainerRecipeFactory
     {

Framework/KubernetesWorkflow/Recipe/ContainerResources.cs

@@ -1,6 +1,6 @@
 using Utils;
 
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public class ContainerResources
     {

Framework/KubernetesWorkflow/Recipe/PodAnnotations.cs

@@ -1,4 +1,4 @@
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public class PodAnnotations
     {

Framework/KubernetesWorkflow/Recipe/PodLabels.cs

@@ -1,4 +1,4 @@
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public class PodLabels
     {

Framework/KubernetesWorkflow/Recipe/RecipeComponentFactory.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Utils;
 
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow.Recipe
 {
     public class RecipeComponentFactory
     {

Framework/KubernetesWorkflow/RunningContainers.cs

@@ -1,113 +0,0 @@
-using Logging;
-using Newtonsoft.Json;
-using Utils;
-
-namespace KubernetesWorkflow
-{
-    public class RunningContainers
-    {
-        public RunningContainers(StartupConfig startupConfig, StartResult startResult, RunningContainer[] containers)
-        {
-            StartupConfig = startupConfig;
-            StartResult = startResult;
-            Containers = containers;
-
-            foreach (var c in containers) c.RunningContainers = this;
-        }
-
-        public StartupConfig StartupConfig { get; }
-        public StartResult StartResult { get; }
-        public RunningContainer[] Containers { get; }
-
-        [JsonIgnore]
-        public string Name
-        {
-            get { return $"{Containers.Length}x '{Containers.First().Name}'"; }
-        }
-
-        public string Describe()
-        {
-            return string.Join(",", Containers.Select(c => c.Name));
-        }
-    }
-
-    public class RunningContainer
-    {
-        public RunningContainer(string name, ContainerRecipe recipe, ContainerAddress[] addresses)
-        {
-            Name = name;
-            Recipe = recipe;
-            Addresses = addresses;
-        }
-
-        public string Name { get; }
-        public ContainerRecipe Recipe { get; }
-        public ContainerAddress[] Addresses { get; }
-
-        [JsonIgnore]
-        public RunningContainers RunningContainers { get; internal set; } = null!;
-
-        public Address GetAddress(ILog log, string portTag)
-        {
-            var addresses = Addresses.Where(a => a.PortTag == portTag).ToArray();
-            if (!addresses.Any()) throw new Exception("No addresses found for portTag: " + portTag);
-
-            var select = SelectAddress(addresses);
-            log.Log($"Container '{Name}' selected for tag '{portTag}' address: '{select}'");
-            return select.Address;
-        }
-
-        public Address GetInternalAddress(string portTag)
-        {
-            var containerAddress = Addresses.Single(a => a.PortTag == portTag && a.IsInteral);
-            return containerAddress.Address;
-        }
-
-        private ContainerAddress SelectAddress(ContainerAddress[] addresses)
-        {
-            var location = RunnerLocationUtils.GetRunnerLocation();
-            if (location == RunnerLocation.InternalToCluster)
-            {
-                return addresses.Single(a => a.IsInteral);
-            }
-            if (location == RunnerLocation.ExternalToCluster)
-            {
-                return addresses.Single(a => !a.IsInteral);
-            }
-            throw new Exception("Running location not known.");
-        }
-    }
-
-    public class ContainerAddress
-    {
-        public ContainerAddress(string portTag, Address address, bool isInteral)
-        {
-            PortTag = portTag;
-            Address = address;
-            IsInteral = isInteral;
-        }
-
-        public string PortTag { get; }
-        public Address Address { get; }
-        public bool IsInteral { get; }
-
-        public override string ToString()
-        {
-            var indicator = IsInteral ? "int" : "ext";
-            return $"{indicator} {PortTag} -> '{Address}'";
-        }
-    }
-
-    public static class RunningContainersExtensions
-    {
-        public static RunningContainer[] Containers(this RunningContainers[] runningContainers)
-        {
-            return runningContainers.SelectMany(c => c.Containers).ToArray();
-        }
-
-        public static string Describe(this RunningContainers[] runningContainers)
-        {
-            return string.Join(",", runningContainers.Select(c => c.Describe()));
-        }
-    }
-}

Framework/KubernetesWorkflow/RunningPod.cs

@@ -1,5 +1,7 @@
 using k8s;
 using k8s.Models;
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
 using Newtonsoft.Json;
 
 namespace KubernetesWorkflow
@@ -64,67 +66,4 @@ namespace KubernetesWorkflow
             return Array.Empty<Port>();
         }
     }
-
-    public class RunningDeployment
-    {
-        public RunningDeployment(string name, string podLabel)
-        {
-            Name = name;
-            PodLabel = podLabel;
-        }
-
-        public string Name { get; }
-        public string PodLabel { get; }
-    }
-
-    public class RunningService
-    {
-        public RunningService(string name, List<ContainerRecipePortMapEntry> result)
-        {
-            Name = name;
-            Result = result;
-        }
-
-        public string Name { get; }
-        public List<ContainerRecipePortMapEntry> Result { get; }
-
-        public Port? GetServicePortForRecipeAndTag(ContainerRecipe recipe, string tag)
-        {
-            return GetServicePortsForRecipe(recipe).SingleOrDefault(p => p.Tag == tag);
-        }
-
-        public Port[] GetServicePortsForRecipe(ContainerRecipe recipe)
-        {
-            return Result
-                .Where(p => p.RecipeNumber == recipe.Number)
-                .SelectMany(p => p.Ports)
-                .ToArray();
-        }
-    }
-
-    public class ContainerRecipePortMapEntry
-    {
-        public ContainerRecipePortMapEntry(int recipeNumber, Port[] ports)
-        {
-            RecipeNumber = recipeNumber;
-            Ports = ports;
-        }
-
-        public int RecipeNumber { get; }
-        public Port[] Ports { get; }
-    }
-
-    public class PodInfo
-    {
-        public PodInfo(string name, string ip, string k8sNodeName)
-        {
-            Name = name;
-            Ip = ip;
-            K8SNodeName = k8sNodeName;
-        }
-
-        public string Name { get; }
-        public string Ip { get; }
-        public string K8SNodeName { get; }
-    }
 }

Framework/KubernetesWorkflow/StartupWorkflow.cs

@@ -1,4 +1,6 @@
-using Logging;
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
+using Logging;
 using Newtonsoft.Json;
 using Utils;
 
@@ -241,25 +243,4 @@ namespace KubernetesWorkflow
             }
         }
     }
-
-    public interface ILogHandler
-    {
-        void Log(Stream log);
-    }
-
-    public abstract class LogHandler : ILogHandler
-    {
-        public void Log(Stream log)
-        {
-            using var reader = new StreamReader(log);
-            var line = reader.ReadLine();
-            while (line != null)
-            {
-                ProcessLine(line);
-                line = reader.ReadLine();
-            }
-        }
-
-        protected abstract void ProcessLine(string line);
-    }
 }

Framework/KubernetesWorkflow/Types/ContainerAddress.cs

@@ -0,0 +1,24 @@
+using Utils;
+
+namespace KubernetesWorkflow.Types
+{
+    public class ContainerAddress
+    {
+        public ContainerAddress(string portTag, Address address, bool isInteral)
+        {
+            PortTag = portTag;
+            Address = address;
+            IsInteral = isInteral;
+        }
+
+        public string PortTag { get; }
+        public Address Address { get; }
+        public bool IsInteral { get; }
+
+        public override string ToString()
+        {
+            var indicator = IsInteral ? "int" : "ext";
+            return $"{indicator} {PortTag} -> '{Address}'";
+        }
+    }
+}

Framework/KubernetesWorkflow/Types/ContainerRecipePortMapEntry.cs

@@ -0,0 +1,16 @@
+using KubernetesWorkflow.Recipe;
+
+namespace KubernetesWorkflow.Types
+{
+    public class ContainerRecipePortMapEntry
+    {
+        public ContainerRecipePortMapEntry(int recipeNumber, Port[] ports)
+        {
+            RecipeNumber = recipeNumber;
+            Ports = ports;
+        }
+
+        public int RecipeNumber { get; }
+        public Port[] Ports { get; }
+    }
+}

Framework/KubernetesWorkflow/Types/K8sNodeLabel.cs

@@ -0,0 +1,14 @@
+namespace KubernetesWorkflow.Types
+{
+    public class K8sNodeLabel
+    {
+        public K8sNodeLabel(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        public string Key { get; }
+        public string Value { get; }
+    }
+}

Framework/KubernetesWorkflow/Types/PodInfo.cs

@@ -0,0 +1,16 @@
+namespace KubernetesWorkflow.Types
+{
+    public class PodInfo
+    {
+        public PodInfo(string name, string ip, string k8sNodeName)
+        {
+            Name = name;
+            Ip = ip;
+            K8SNodeName = k8sNodeName;
+        }
+
+        public string Name { get; }
+        public string Ip { get; }
+        public string K8SNodeName { get; }
+    }
+}

Framework/KubernetesWorkflow/Types/RunningContainer.cs

@@ -0,0 +1,54 @@
+using KubernetesWorkflow.Recipe;
+using Logging;
+using Newtonsoft.Json;
+using Utils;
+
+namespace KubernetesWorkflow.Types
+{
+    public class RunningContainer
+    {
+        public RunningContainer(string name, ContainerRecipe recipe, ContainerAddress[] addresses)
+        {
+            Name = name;
+            Recipe = recipe;
+            Addresses = addresses;
+        }
+
+        public string Name { get; }
+        public ContainerRecipe Recipe { get; }
+        public ContainerAddress[] Addresses { get; }
+
+        [JsonIgnore]
+        public RunningContainers RunningContainers { get; internal set; } = null!;
+
+        public Address GetAddress(ILog log, string portTag)
+        {
+            var addresses = Addresses.Where(a => a.PortTag == portTag).ToArray();
+            if (!addresses.Any()) throw new Exception("No addresses found for portTag: " + portTag);
+
+            var select = SelectAddress(addresses);
+            log.Debug($"Container '{Name}' selected for tag '{portTag}' address: '{select}'");
+            return select.Address;
+        }
+
+        public Address GetInternalAddress(string portTag)
+        {
+            var containerAddress = Addresses.Single(a => a.PortTag == portTag && a.IsInteral);
+            return containerAddress.Address;
+        }
+
+        private ContainerAddress SelectAddress(ContainerAddress[] addresses)
+        {
+            var location = RunnerLocationUtils.GetRunnerLocation();
+            if (location == RunnerLocation.InternalToCluster)
+            {
+                return addresses.Single(a => a.IsInteral);
+            }
+            if (location == RunnerLocation.ExternalToCluster)
+            {
+                return addresses.Single(a => !a.IsInteral);
+            }
+            throw new Exception("Running location not known.");
+        }
+    }
+}

Framework/KubernetesWorkflow/Types/RunningContainers.cs

@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+
+namespace KubernetesWorkflow.Types
+{
+    public class RunningContainers
+    {
+        public RunningContainers(StartupConfig startupConfig, StartResult startResult, RunningContainer[] containers)
+        {
+            StartupConfig = startupConfig;
+            StartResult = startResult;
+            Containers = containers;
+
+            foreach (var c in containers) c.RunningContainers = this;
+        }
+
+        public StartupConfig StartupConfig { get; }
+        public StartResult StartResult { get; }
+        public RunningContainer[] Containers { get; }
+
+        [JsonIgnore]
+        public string Name
+        {
+            get { return $"{Containers.Length}x '{Containers.First().Name}'"; }
+        }
+
+        public string Describe()
+        {
+            return string.Join(",", Containers.Select(c => c.Name));
+        }
+    }
+
+    public static class RunningContainersExtensions
+    {
+        public static RunningContainer[] Containers(this RunningContainers[] runningContainers)
+        {
+            return runningContainers.SelectMany(c => c.Containers).ToArray();
+        }
+
+        public static string Describe(this RunningContainers[] runningContainers)
+        {
+            return string.Join(",", runningContainers.Select(c => c.Describe()));
+        }
+    }
+}

Framework/KubernetesWorkflow/Types/RunningDeployment.cs

@@ -0,0 +1,14 @@
+namespace KubernetesWorkflow.Types
+{
+    public class RunningDeployment
+    {
+        public RunningDeployment(string name, string podLabel)
+        {
+            Name = name;
+            PodLabel = podLabel;
+        }
+
+        public string Name { get; }
+        public string PodLabel { get; }
+    }
+}

Framework/KubernetesWorkflow/Types/RunningService.cs

@@ -0,0 +1,29 @@
+using KubernetesWorkflow.Recipe;
+
+namespace KubernetesWorkflow.Types
+{
+    public class RunningService
+    {
+        public RunningService(string name, List<ContainerRecipePortMapEntry> result)
+        {
+            Name = name;
+            Result = result;
+        }
+
+        public string Name { get; }
+        public List<ContainerRecipePortMapEntry> Result { get; }
+
+        public Port? GetServicePortForRecipeAndTag(ContainerRecipe recipe, string tag)
+        {
+            return GetServicePortsForRecipe(recipe).SingleOrDefault(p => p.Tag == tag);
+        }
+
+        public Port[] GetServicePortsForRecipe(ContainerRecipe recipe)
+        {
+            return Result
+                .Where(p => p.RecipeNumber == recipe.Number)
+                .SelectMany(p => p.Ports)
+                .ToArray();
+        }
+    }
+}

ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs

@@ -1,5 +1,6 @@
 using GethPlugin;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
 using Logging;
 
 namespace CodexContractsPlugin

ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs

@@ -1,6 +1,7 @@
 using Core;
 using GethPlugin;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using Utils;
 

ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs

@@ -1,5 +1,6 @@
 using Core;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace CodexDiscordBotPlugin
 {

ProjectPlugins/CodexDiscordBotPlugin/CoreInterfaceExtensions.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace CodexDiscordBotPlugin
 {

ProjectPlugins/CodexDiscordBotPlugin/DiscordBotContainerRecipe.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
 using Utils;
 
 namespace CodexDiscordBotPlugin

ProjectPlugins/CodexPlugin/CodexAccess.cs

@@ -1,5 +1,6 @@
 using Core;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Utils;
 
 namespace CodexPlugin

ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs

@@ -1,5 +1,6 @@
 using GethPlugin;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
 using Utils;
 
 namespace CodexPlugin

ProjectPlugins/CodexPlugin/CodexDeployment.cs

@@ -1,6 +1,6 @@
 using CodexContractsPlugin;
 using GethPlugin;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace CodexPlugin
 {

ProjectPlugins/CodexPlugin/CodexNode.cs

@@ -2,6 +2,7 @@
 using FileUtils;
 using GethPlugin;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using MetricsPlugin;
 using Utils;

ProjectPlugins/CodexPlugin/CodexNodeFactory.cs

@@ -1,6 +1,7 @@
 using Core;
 using GethPlugin;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace CodexPlugin
 {

ProjectPlugins/CodexPlugin/CodexNodeGroup.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using MetricsPlugin;
 using System.Collections;
 

ProjectPlugins/CodexPlugin/CodexPlugin.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace CodexPlugin
 {

ProjectPlugins/CodexPlugin/CodexStarter.cs

@@ -1,5 +1,6 @@
 using Core;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 
 namespace CodexPlugin

ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace CodexPlugin
 {

ProjectPlugins/DeployAndRunPlugin/CoreInterfaceExtensions.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace DeployAndRunPlugin
 {

ProjectPlugins/DeployAndRunPlugin/DeployAndRunContainerRecipe.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
 
 namespace DeployAndRunPlugin
 {

ProjectPlugins/DeployAndRunPlugin/DeployAndRunPlugin.cs

@@ -1,5 +1,6 @@
 using Core;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace DeployAndRunPlugin
 {

ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using Utils;
 

ProjectPlugins/GethPlugin/GethContainerRecipe.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
 
 namespace GethPlugin
 {

ProjectPlugins/GethPlugin/GethDeployment.cs

@@ -1,5 +1,6 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
 using Newtonsoft.Json;
 
 namespace GethPlugin

ProjectPlugins/GethPlugin/GethNode.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using Nethereum.Contracts;
 using NethereumWorkflow;

ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 
 namespace MetricsPlugin

ProjectPlugins/MetricsPlugin/MetricsAccess.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Utils;
 
 namespace MetricsPlugin

ProjectPlugins/MetricsPlugin/MetricsPlugin.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 
 namespace MetricsPlugin

ProjectPlugins/MetricsPlugin/MetricsQuery.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using System.Globalization;
 

ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs

@@ -1,4 +1,4 @@
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace MetricsPlugin
 {

ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs

@@ -1,4 +1,5 @@
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
 
 namespace MetricsPlugin
 {

ProjectPlugins/MetricsPlugin/PrometheusStarter.cs

@@ -1,5 +1,6 @@
 using Core;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using System.Text;
 

Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs

@@ -1,5 +1,5 @@
 using Core;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using Utils;
 

Tests/CodexContinuousTests/NodeRunner.cs

@@ -1,9 +1,9 @@
-using KubernetesWorkflow;
+using NUnit.Framework;
-using NUnit.Framework;
 using Logging;
 using Utils;
 using Core;
 using CodexPlugin;
+using KubernetesWorkflow.Types;
 
 namespace ContinuousTests
 {

Tests/CodexContinuousTests/SingleTestRun.cs

@@ -1,11 +1,11 @@
 using Logging;
 using Utils;
-using KubernetesWorkflow;
 using NUnit.Framework.Internal;
 using System.Reflection;
 using CodexPlugin;
 using DistTestCore.Logs;
 using Core;
+using KubernetesWorkflow.Types;
 
 namespace ContinuousTests
 {

Tests/CodexTests/BasicTests/ContinuousSubstitute.cs

@@ -1,7 +1,7 @@
 using CodexContractsPlugin;
 using CodexPlugin;
 using GethPlugin;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using MetricsPlugin;
 using NUnit.Framework;

Tests/DistTestCore/TestLifecycle.cs

@@ -2,6 +2,8 @@
 using DistTestCore.Logs;
 using FileUtils;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
 using Utils;
 
 namespace DistTestCore

Tools/CodexNetDeployer/Deployer.cs

@@ -3,7 +3,7 @@ using CodexDiscordBotPlugin;
 using CodexPlugin;
 using Core;
 using GethPlugin;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using MetricsPlugin;
 

Tools/CodexNetDeployer/K8sHook.cs

@@ -1,5 +1,7 @@
 using DistTestCore;
 using KubernetesWorkflow;
+using KubernetesWorkflow.Recipe;
+using KubernetesWorkflow.Types;
 
 namespace CodexNetDeployer
 {

Tools/TestClusterStarter/ClusterTestSpec.cs

@@ -1,4 +1,4 @@
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 
 namespace TestClusterStarter
 {

Tools/TestClusterStarter/Program.cs

@@ -1,7 +1,7 @@
 using ArgsUniform;
 using Core;
 using DeployAndRunPlugin;
-using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
 using Logging;
 using Newtonsoft.Json;
 using TestClusterStarter;