diff --git a/Framework/Core/CoreInterface.cs b/Framework/Core/CoreInterface.cs index 21b9491..b43c1c2 100644 --- a/Framework/Core/CoreInterface.cs +++ b/Framework/Core/CoreInterface.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace Core { diff --git a/Framework/KubernetesWorkflow/K8sCluster.cs b/Framework/KubernetesWorkflow/K8sCluster.cs index 4d21aaf..366855f 100644 --- a/Framework/KubernetesWorkflow/K8sCluster.cs +++ b/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; } - } } diff --git a/Framework/KubernetesWorkflow/K8sController.cs b/Framework/KubernetesWorkflow/K8sController.cs index 0ff862e..4d4ca11 100644 --- a/Framework/KubernetesWorkflow/K8sController.cs +++ b/Framework/KubernetesWorkflow/K8sController.cs @@ -1,5 +1,7 @@ using k8s; using k8s.Models; +using KubernetesWorkflow.Recipe; +using KubernetesWorkflow.Types; using Logging; using Utils; diff --git a/Framework/KubernetesWorkflow/K8sHooks.cs b/Framework/KubernetesWorkflow/K8sHooks.cs index 91c25a3..74bb93b 100644 --- a/Framework/KubernetesWorkflow/K8sHooks.cs +++ b/Framework/KubernetesWorkflow/K8sHooks.cs @@ -1,4 +1,7 @@ -namespace KubernetesWorkflow +using KubernetesWorkflow.Recipe; +using KubernetesWorkflow.Types; + +namespace KubernetesWorkflow { public interface IK8sHooks { diff --git a/Framework/KubernetesWorkflow/Location.cs b/Framework/KubernetesWorkflow/Location.cs index ab0985c..d6d593f 100644 --- a/Framework/KubernetesWorkflow/Location.cs +++ b/Framework/KubernetesWorkflow/Location.cs @@ -1,4 +1,6 @@ -namespace KubernetesWorkflow +using KubernetesWorkflow.Types; + +namespace KubernetesWorkflow { public interface ILocation { diff --git a/Framework/KubernetesWorkflow/LocationProvider.cs b/Framework/KubernetesWorkflow/LocationProvider.cs index 1f4e6bf..8aa2663 100644 --- a/Framework/KubernetesWorkflow/LocationProvider.cs +++ b/Framework/KubernetesWorkflow/LocationProvider.cs @@ -1,4 +1,5 @@ -using Logging; +using KubernetesWorkflow.Types; +using Logging; namespace KubernetesWorkflow { diff --git a/Framework/KubernetesWorkflow/LogHandler.cs b/Framework/KubernetesWorkflow/LogHandler.cs new file mode 100644 index 0000000..77e5746 --- /dev/null +++ b/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); + } +} diff --git a/Framework/KubernetesWorkflow/ContainerAdditionals.cs b/Framework/KubernetesWorkflow/Recipe/ContainerAdditionals.cs similarity index 94% rename from Framework/KubernetesWorkflow/ContainerAdditionals.cs rename to Framework/KubernetesWorkflow/Recipe/ContainerAdditionals.cs index 015e55b..21fe249 100644 --- a/Framework/KubernetesWorkflow/ContainerAdditionals.cs +++ b/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(); } diff --git a/Framework/KubernetesWorkflow/ContainerRecipe.cs b/Framework/KubernetesWorkflow/Recipe/ContainerRecipe.cs similarity index 99% rename from Framework/KubernetesWorkflow/ContainerRecipe.cs rename to Framework/KubernetesWorkflow/Recipe/ContainerRecipe.cs index 19d063b..b66bd42 100644 --- a/Framework/KubernetesWorkflow/ContainerRecipe.cs +++ b/Framework/KubernetesWorkflow/Recipe/ContainerRecipe.cs @@ -1,4 +1,4 @@ -namespace KubernetesWorkflow +namespace KubernetesWorkflow.Recipe { public class ContainerRecipe { diff --git a/Framework/KubernetesWorkflow/ContainerRecipeFactory.cs b/Framework/KubernetesWorkflow/Recipe/ContainerRecipeFactory.cs similarity index 99% rename from Framework/KubernetesWorkflow/ContainerRecipeFactory.cs rename to Framework/KubernetesWorkflow/Recipe/ContainerRecipeFactory.cs index 3fdd5de..134b280 100644 --- a/Framework/KubernetesWorkflow/ContainerRecipeFactory.cs +++ b/Framework/KubernetesWorkflow/Recipe/ContainerRecipeFactory.cs @@ -1,6 +1,6 @@ using Utils; -namespace KubernetesWorkflow +namespace KubernetesWorkflow.Recipe { public abstract class ContainerRecipeFactory { diff --git a/Framework/KubernetesWorkflow/ContainerResources.cs b/Framework/KubernetesWorkflow/Recipe/ContainerResources.cs similarity index 97% rename from Framework/KubernetesWorkflow/ContainerResources.cs rename to Framework/KubernetesWorkflow/Recipe/ContainerResources.cs index 40e5dc5..6b8b8a3 100644 --- a/Framework/KubernetesWorkflow/ContainerResources.cs +++ b/Framework/KubernetesWorkflow/Recipe/ContainerResources.cs @@ -1,6 +1,6 @@ using Utils; -namespace KubernetesWorkflow +namespace KubernetesWorkflow.Recipe { public class ContainerResources { diff --git a/Framework/KubernetesWorkflow/PodAnnotations.cs b/Framework/KubernetesWorkflow/Recipe/PodAnnotations.cs similarity index 94% rename from Framework/KubernetesWorkflow/PodAnnotations.cs rename to Framework/KubernetesWorkflow/Recipe/PodAnnotations.cs index 16edb8a..4de2e98 100644 --- a/Framework/KubernetesWorkflow/PodAnnotations.cs +++ b/Framework/KubernetesWorkflow/Recipe/PodAnnotations.cs @@ -1,4 +1,4 @@ -namespace KubernetesWorkflow +namespace KubernetesWorkflow.Recipe { public class PodAnnotations { diff --git a/Framework/KubernetesWorkflow/PodLabels.cs b/Framework/KubernetesWorkflow/Recipe/PodLabels.cs similarity index 94% rename from Framework/KubernetesWorkflow/PodLabels.cs rename to Framework/KubernetesWorkflow/Recipe/PodLabels.cs index d8b7333..c7f8d8e 100644 --- a/Framework/KubernetesWorkflow/PodLabels.cs +++ b/Framework/KubernetesWorkflow/Recipe/PodLabels.cs @@ -1,4 +1,4 @@ -namespace KubernetesWorkflow +namespace KubernetesWorkflow.Recipe { public class PodLabels { diff --git a/Framework/KubernetesWorkflow/RecipeComponentFactory.cs b/Framework/KubernetesWorkflow/Recipe/RecipeComponentFactory.cs similarity index 95% rename from Framework/KubernetesWorkflow/RecipeComponentFactory.cs rename to Framework/KubernetesWorkflow/Recipe/RecipeComponentFactory.cs index 71f37b3..c144746 100644 --- a/Framework/KubernetesWorkflow/RecipeComponentFactory.cs +++ b/Framework/KubernetesWorkflow/Recipe/RecipeComponentFactory.cs @@ -1,7 +1,7 @@ using System.Globalization; using Utils; -namespace KubernetesWorkflow +namespace KubernetesWorkflow.Recipe { public class RecipeComponentFactory { diff --git a/Framework/KubernetesWorkflow/RunningContainers.cs b/Framework/KubernetesWorkflow/RunningContainers.cs deleted file mode 100644 index 602f6a4..0000000 --- a/Framework/KubernetesWorkflow/RunningContainers.cs +++ /dev/null @@ -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())); - } - } -} diff --git a/Framework/KubernetesWorkflow/RunningPod.cs b/Framework/KubernetesWorkflow/RunningPod.cs index f0dfc6c..e86b2aa 100644 --- a/Framework/KubernetesWorkflow/RunningPod.cs +++ b/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(); } } - - 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 result) - { - Name = name; - Result = result; - } - - public string Name { get; } - public List 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; } - } } diff --git a/Framework/KubernetesWorkflow/StartupWorkflow.cs b/Framework/KubernetesWorkflow/StartupWorkflow.cs index 6f613ee..20ab753 100644 --- a/Framework/KubernetesWorkflow/StartupWorkflow.cs +++ b/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); - } } diff --git a/Framework/KubernetesWorkflow/Types/ContainerAddress.cs b/Framework/KubernetesWorkflow/Types/ContainerAddress.cs new file mode 100644 index 0000000..e40ee42 --- /dev/null +++ b/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}'"; + } + } +} diff --git a/Framework/KubernetesWorkflow/Types/ContainerRecipePortMapEntry.cs b/Framework/KubernetesWorkflow/Types/ContainerRecipePortMapEntry.cs new file mode 100644 index 0000000..debdfcf --- /dev/null +++ b/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; } + } +} diff --git a/Framework/KubernetesWorkflow/Types/K8sNodeLabel.cs b/Framework/KubernetesWorkflow/Types/K8sNodeLabel.cs new file mode 100644 index 0000000..ba3dc9a --- /dev/null +++ b/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; } + } +} diff --git a/Framework/KubernetesWorkflow/Types/PodInfo.cs b/Framework/KubernetesWorkflow/Types/PodInfo.cs new file mode 100644 index 0000000..ca8ee37 --- /dev/null +++ b/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; } + } +} diff --git a/Framework/KubernetesWorkflow/Types/RunningContainer.cs b/Framework/KubernetesWorkflow/Types/RunningContainer.cs new file mode 100644 index 0000000..f391e45 --- /dev/null +++ b/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."); + } + } +} diff --git a/Framework/KubernetesWorkflow/Types/RunningContainers.cs b/Framework/KubernetesWorkflow/Types/RunningContainers.cs new file mode 100644 index 0000000..9a6e5f3 --- /dev/null +++ b/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())); + } + } +} diff --git a/Framework/KubernetesWorkflow/Types/RunningDeployment.cs b/Framework/KubernetesWorkflow/Types/RunningDeployment.cs new file mode 100644 index 0000000..05298ed --- /dev/null +++ b/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; } + } +} diff --git a/Framework/KubernetesWorkflow/Types/RunningService.cs b/Framework/KubernetesWorkflow/Types/RunningService.cs new file mode 100644 index 0000000..6e2e1f9 --- /dev/null +++ b/Framework/KubernetesWorkflow/Types/RunningService.cs @@ -0,0 +1,29 @@ +using KubernetesWorkflow.Recipe; + +namespace KubernetesWorkflow.Types +{ + public class RunningService + { + public RunningService(string name, List result) + { + Name = name; + Result = result; + } + + public string Name { get; } + public List 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(); + } + } +} diff --git a/ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs index 1dffe3f..d6dd92f 100644 --- a/ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs +++ b/ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs @@ -1,5 +1,6 @@ using GethPlugin; using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; using Logging; namespace CodexContractsPlugin diff --git a/ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs index 8fb1bfd..acfc0ac 100644 --- a/ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs +++ b/ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs @@ -1,6 +1,7 @@ using Core; using GethPlugin; using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using Utils; diff --git a/ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs b/ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs index 2ea164c..94cf4e6 100644 --- a/ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs +++ b/ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs b/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs index b92230a..91c38e4 100644 --- a/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs +++ b/ProjectPlugins/CodexDiscordBotPlugin/CodexDiscordBotPlugin.cs @@ -1,5 +1,6 @@ using Core; using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace CodexDiscordBotPlugin { diff --git a/ProjectPlugins/CodexDiscordBotPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/CodexDiscordBotPlugin/CoreInterfaceExtensions.cs index 86f2129..1c3d673 100644 --- a/ProjectPlugins/CodexDiscordBotPlugin/CoreInterfaceExtensions.cs +++ b/ProjectPlugins/CodexDiscordBotPlugin/CoreInterfaceExtensions.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace CodexDiscordBotPlugin { diff --git a/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotContainerRecipe.cs b/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotContainerRecipe.cs index c65dd9c..b4b1432 100644 --- a/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotContainerRecipe.cs +++ b/ProjectPlugins/CodexDiscordBotPlugin/DiscordBotContainerRecipe.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; using Utils; namespace CodexDiscordBotPlugin diff --git a/ProjectPlugins/CodexPlugin/CodexAccess.cs b/ProjectPlugins/CodexPlugin/CodexAccess.cs index 3d11abe..9fa1683 100644 --- a/ProjectPlugins/CodexPlugin/CodexAccess.cs +++ b/ProjectPlugins/CodexPlugin/CodexAccess.cs @@ -1,5 +1,6 @@ using Core; using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Utils; namespace CodexPlugin diff --git a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs index 2d80be2..bfdf52b 100644 --- a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs +++ b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs @@ -1,5 +1,6 @@ using GethPlugin; using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; using Utils; namespace CodexPlugin diff --git a/ProjectPlugins/CodexPlugin/CodexDeployment.cs b/ProjectPlugins/CodexPlugin/CodexDeployment.cs index 238b116..e1548ed 100644 --- a/ProjectPlugins/CodexPlugin/CodexDeployment.cs +++ b/ProjectPlugins/CodexPlugin/CodexDeployment.cs @@ -1,6 +1,6 @@ using CodexContractsPlugin; using GethPlugin; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace CodexPlugin { diff --git a/ProjectPlugins/CodexPlugin/CodexNode.cs b/ProjectPlugins/CodexPlugin/CodexNode.cs index e688d5d..0a3c659 100644 --- a/ProjectPlugins/CodexPlugin/CodexNode.cs +++ b/ProjectPlugins/CodexPlugin/CodexNode.cs @@ -2,6 +2,7 @@ using FileUtils; using GethPlugin; using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using MetricsPlugin; using Utils; diff --git a/ProjectPlugins/CodexPlugin/CodexNodeFactory.cs b/ProjectPlugins/CodexPlugin/CodexNodeFactory.cs index 4b9dfdd..f0c7166 100644 --- a/ProjectPlugins/CodexPlugin/CodexNodeFactory.cs +++ b/ProjectPlugins/CodexPlugin/CodexNodeFactory.cs @@ -1,6 +1,7 @@ using Core; using GethPlugin; using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace CodexPlugin { diff --git a/ProjectPlugins/CodexPlugin/CodexNodeGroup.cs b/ProjectPlugins/CodexPlugin/CodexNodeGroup.cs index 01c5661..0b6dee7 100644 --- a/ProjectPlugins/CodexPlugin/CodexNodeGroup.cs +++ b/ProjectPlugins/CodexPlugin/CodexNodeGroup.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using MetricsPlugin; using System.Collections; diff --git a/ProjectPlugins/CodexPlugin/CodexPlugin.cs b/ProjectPlugins/CodexPlugin/CodexPlugin.cs index 1c83d81..205b0d2 100644 --- a/ProjectPlugins/CodexPlugin/CodexPlugin.cs +++ b/ProjectPlugins/CodexPlugin/CodexPlugin.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace CodexPlugin { diff --git a/ProjectPlugins/CodexPlugin/CodexStarter.cs b/ProjectPlugins/CodexPlugin/CodexStarter.cs index 718ef22..ae217c7 100644 --- a/ProjectPlugins/CodexPlugin/CodexStarter.cs +++ b/ProjectPlugins/CodexPlugin/CodexStarter.cs @@ -1,5 +1,6 @@ using Core; using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; namespace CodexPlugin diff --git a/ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs index a79615e..529b7fd 100644 --- a/ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs +++ b/ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace CodexPlugin { diff --git a/ProjectPlugins/DeployAndRunPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/DeployAndRunPlugin/CoreInterfaceExtensions.cs index 262e27d..f0d71f4 100644 --- a/ProjectPlugins/DeployAndRunPlugin/CoreInterfaceExtensions.cs +++ b/ProjectPlugins/DeployAndRunPlugin/CoreInterfaceExtensions.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace DeployAndRunPlugin { diff --git a/ProjectPlugins/DeployAndRunPlugin/DeployAndRunContainerRecipe.cs b/ProjectPlugins/DeployAndRunPlugin/DeployAndRunContainerRecipe.cs index 9692225..866cfaf 100644 --- a/ProjectPlugins/DeployAndRunPlugin/DeployAndRunContainerRecipe.cs +++ b/ProjectPlugins/DeployAndRunPlugin/DeployAndRunContainerRecipe.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; namespace DeployAndRunPlugin { diff --git a/ProjectPlugins/DeployAndRunPlugin/DeployAndRunPlugin.cs b/ProjectPlugins/DeployAndRunPlugin/DeployAndRunPlugin.cs index 82d80e0..070b9fe 100644 --- a/ProjectPlugins/DeployAndRunPlugin/DeployAndRunPlugin.cs +++ b/ProjectPlugins/DeployAndRunPlugin/DeployAndRunPlugin.cs @@ -1,5 +1,6 @@ using Core; using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace DeployAndRunPlugin { diff --git a/ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs b/ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs index 51c8728..4fc7676 100644 --- a/ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs +++ b/ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using Utils; diff --git a/ProjectPlugins/GethPlugin/GethContainerRecipe.cs b/ProjectPlugins/GethPlugin/GethContainerRecipe.cs index e74c2c5..f9eaf79 100644 --- a/ProjectPlugins/GethPlugin/GethContainerRecipe.cs +++ b/ProjectPlugins/GethPlugin/GethContainerRecipe.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; namespace GethPlugin { diff --git a/ProjectPlugins/GethPlugin/GethDeployment.cs b/ProjectPlugins/GethPlugin/GethDeployment.cs index 2461811..8d7f0dd 100644 --- a/ProjectPlugins/GethPlugin/GethDeployment.cs +++ b/ProjectPlugins/GethPlugin/GethDeployment.cs @@ -1,5 +1,6 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; +using KubernetesWorkflow.Types; using Newtonsoft.Json; namespace GethPlugin diff --git a/ProjectPlugins/GethPlugin/GethNode.cs b/ProjectPlugins/GethPlugin/GethNode.cs index 2e6a30b..19c3708 100644 --- a/ProjectPlugins/GethPlugin/GethNode.cs +++ b/ProjectPlugins/GethPlugin/GethNode.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using Nethereum.Contracts; using NethereumWorkflow; diff --git a/ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs index 279594b..8392082 100644 --- a/ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs +++ b/ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; namespace MetricsPlugin diff --git a/ProjectPlugins/MetricsPlugin/MetricsAccess.cs b/ProjectPlugins/MetricsPlugin/MetricsAccess.cs index 0f8ef01..a35fc80 100644 --- a/ProjectPlugins/MetricsPlugin/MetricsAccess.cs +++ b/ProjectPlugins/MetricsPlugin/MetricsAccess.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Utils; namespace MetricsPlugin diff --git a/ProjectPlugins/MetricsPlugin/MetricsPlugin.cs b/ProjectPlugins/MetricsPlugin/MetricsPlugin.cs index a99ae0b..b2c2b8e 100644 --- a/ProjectPlugins/MetricsPlugin/MetricsPlugin.cs +++ b/ProjectPlugins/MetricsPlugin/MetricsPlugin.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; namespace MetricsPlugin diff --git a/ProjectPlugins/MetricsPlugin/MetricsQuery.cs b/ProjectPlugins/MetricsPlugin/MetricsQuery.cs index 62a0553..427d35d 100644 --- a/ProjectPlugins/MetricsPlugin/MetricsQuery.cs +++ b/ProjectPlugins/MetricsPlugin/MetricsQuery.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using System.Globalization; diff --git a/ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs b/ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs index 1913712..5c9cbd1 100644 --- a/ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs +++ b/ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs @@ -1,4 +1,4 @@ -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace MetricsPlugin { diff --git a/ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs b/ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs index 2696915..a4dfdb4 100644 --- a/ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs +++ b/ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs @@ -1,4 +1,5 @@ using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; namespace MetricsPlugin { diff --git a/ProjectPlugins/MetricsPlugin/PrometheusStarter.cs b/ProjectPlugins/MetricsPlugin/PrometheusStarter.cs index 6c04c72..0f0bc13 100644 --- a/ProjectPlugins/MetricsPlugin/PrometheusStarter.cs +++ b/ProjectPlugins/MetricsPlugin/PrometheusStarter.cs @@ -1,5 +1,6 @@ using Core; using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using System.Text; diff --git a/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs b/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs index 3311efb..9b7e608 100644 --- a/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs +++ b/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs @@ -1,5 +1,5 @@ using Core; -using KubernetesWorkflow; +using KubernetesWorkflow.Types; using Logging; using Utils; diff --git a/Tests/CodexContinuousTests/NodeRunner.cs b/Tests/CodexContinuousTests/NodeRunner.cs index b9e78e2..488e47a 100644 --- a/Tests/CodexContinuousTests/NodeRunner.cs +++ b/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 { diff --git a/Tests/CodexContinuousTests/SingleTestRun.cs b/Tests/CodexContinuousTests/SingleTestRun.cs index f86e502..356b127 100644 --- a/Tests/CodexContinuousTests/SingleTestRun.cs +++ b/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 { diff --git a/Tests/CodexTests/BasicTests/ContinuousSubstitute.cs b/Tests/CodexTests/BasicTests/ContinuousSubstitute.cs index 13a8b2c..9974d7d 100644 --- a/Tests/CodexTests/BasicTests/ContinuousSubstitute.cs +++ b/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; diff --git a/Tests/DistTestCore/TestLifecycle.cs b/Tests/DistTestCore/TestLifecycle.cs index 47a17b3..896ab66 100644 --- a/Tests/DistTestCore/TestLifecycle.cs +++ b/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 diff --git a/Tools/CodexNetDeployer/Deployer.cs b/Tools/CodexNetDeployer/Deployer.cs index ff2dd6f..a0263b5 100644 --- a/Tools/CodexNetDeployer/Deployer.cs +++ b/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; diff --git a/Tools/CodexNetDeployer/K8sHook.cs b/Tools/CodexNetDeployer/K8sHook.cs index f89a3fc..f586613 100644 --- a/Tools/CodexNetDeployer/K8sHook.cs +++ b/Tools/CodexNetDeployer/K8sHook.cs @@ -1,5 +1,7 @@ using DistTestCore; using KubernetesWorkflow; +using KubernetesWorkflow.Recipe; +using KubernetesWorkflow.Types; namespace CodexNetDeployer { diff --git a/Tools/TestClusterStarter/ClusterTestSpec.cs b/Tools/TestClusterStarter/ClusterTestSpec.cs index 88b18c2..f44be21 100644 --- a/Tools/TestClusterStarter/ClusterTestSpec.cs +++ b/Tools/TestClusterStarter/ClusterTestSpec.cs @@ -1,4 +1,4 @@ -using KubernetesWorkflow; +using KubernetesWorkflow.Types; namespace TestClusterStarter { diff --git a/Tools/TestClusterStarter/Program.cs b/Tools/TestClusterStarter/Program.cs index 2830661..9fe44ce 100644 --- a/Tools/TestClusterStarter/Program.cs +++ b/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;