diff --git a/CodexNetDeployer/ArgOrVar.cs b/CodexNetDeployer/ArgOrVar.cs index f4e35cd3..5844b68a 100644 --- a/CodexNetDeployer/ArgOrVar.cs +++ b/CodexNetDeployer/ArgOrVar.cs @@ -55,8 +55,8 @@ "The deployer will set up the required supporting services, deploy the Codex on-chain contracts, start and bootstrap the Codex instances. " + "All Kubernetes objects will be created in the namespace provided, allowing you to easily find, modify, and delete them afterwards." + nl); - Console.WriteLine("CodexNetDeployer assumes you are running this tool from *outside* the Kubernetes cluster you want to deploy to. " + - "If you are running this from a container inside the cluster, add the argument '--internal'." + nl); + Console.WriteLine("CodexNetDeployer assumes you are running this tool from *inside* the Kubernetes cluster you want to deploy to. " + + "If you are not running this from a container inside the cluster, add the argument '--external'." + nl); Console.Write("\t[ CLI argument ] or [ Environment variable ]"); Console.CursorLeft = 70; diff --git a/CodexNetDeployer/Deployer.cs b/CodexNetDeployer/Deployer.cs index a4298b94..137ce882 100644 --- a/CodexNetDeployer/Deployer.cs +++ b/CodexNetDeployer/Deployer.cs @@ -46,12 +46,14 @@ namespace CodexNetDeployer var workflow = workflowCreator.CreateWorkflow(); var workflowStartup = new StartupConfig(); var codexStart = new CodexStartupConfig(config.CodexLogLevel); + workflowStartup.Add(gethResults); + workflowStartup.Add(codexStart); + if (!string.IsNullOrEmpty(bootstrapSpr)) codexStart.BootstrapSpr = bootstrapSpr; codexStart.StorageQuota = config.StorageQuota.Value.MB(); var marketplaceConfig = new MarketplaceInitialConfig(100000.Eth(), 0.TestTokens(), validatorsLeft > 0); marketplaceConfig.AccountIndexOverride = i; codexStart.MarketplaceConfig = marketplaceConfig; - workflowStartup.Add(gethResults); var containers = workflow.Start(1, Location.Unspecified, new CodexContainerRecipe(), workflowStartup); @@ -63,7 +65,7 @@ namespace CodexNetDeployer if (!string.IsNullOrWhiteSpace(debugInfo.spr)) { var pod = container.Pod.PodInfo; - Console.Write($"Online ({pod.Name} at {pod.Ip} on '{pod.K8SNodeName}'" + Environment.NewLine); + Console.Write($"Online ({pod.Name} at {pod.Ip} on '{pod.K8SNodeName}')" + Environment.NewLine); if (string.IsNullOrEmpty(bootstrapSpr)) bootstrapSpr = debugInfo.spr; validatorsLeft--; diff --git a/CodexNetDeployer/Program.cs b/CodexNetDeployer/Program.cs index eb3efc30..805b6548 100644 --- a/CodexNetDeployer/Program.cs +++ b/CodexNetDeployer/Program.cs @@ -15,7 +15,8 @@ public class Program "--kube-namespace=testing-deployer", "--nodes=5", "--validators=3", - "--storage-quota=1024" + "--storage-quota=1024", + "--external" }; var nl = Environment.NewLine; @@ -29,10 +30,10 @@ public class Program return; } - var location = TestRunnerLocation.ExternalToCluster; - if (args.Any(a => a == "--internal")) + var location = TestRunnerLocation.InternalToCluster; + if (args.Any(a => a == "--external")) { - location = TestRunnerLocation.InternalToCluster; + location = TestRunnerLocation.ExternalToCluster; } var config = new Configuration(