From 42acb862b68cc83f672d0c8e4fb6c0f3c77a2e00 Mon Sep 17 00:00:00 2001
From: benbierens <thatbenbierens@gmail.com>
Date: Tue, 11 Jul 2023 14:56:40 +0200
Subject: [PATCH] Removes docker images from config because they aren't
 configurable this way.

---
 CodexNetDeployer/Configuration.cs     | 20 +++-----------------
 CodexNetDeployer/Deployer.cs          |  4 ----
 DistTestCore/Codex/CodexDeployment.cs | 10 +---------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/CodexNetDeployer/Configuration.cs b/CodexNetDeployer/Configuration.cs
index f3cc793..b030618 100644
--- a/CodexNetDeployer/Configuration.cs
+++ b/CodexNetDeployer/Configuration.cs
@@ -1,8 +1,6 @@
 using ArgsUniform;
 using DistTestCore;
 using DistTestCore.Codex;
-using DistTestCore.Marketplace;
-using DistTestCore.Metrics;
 
 namespace CodexNetDeployer
 {
@@ -10,18 +8,6 @@ namespace CodexNetDeployer
     {
         public const int SecondsIn1Day = 24 * 60 * 60;
 
-        [Uniform("codex-image", "ci", "CODEXIMAGE", true, "Docker image of Codex.")]
-        public string CodexImage { get; set; } = CodexContainerRecipe.DockerImage;
-
-        [Uniform("geth-image", "gi", "GETHIMAGE", true, "Docker image of Geth.")]
-        public string GethImage { get; set; } = GethContainerRecipe.DockerImage;
-
-        [Uniform("contracts-image", "oi", "CONTRACTSIMAGE", true, "Docker image of Codex Contracts.")]
-        public string ContractsImage { get; set; } = CodexContractsContainerRecipe.DockerImage;
-
-        [Uniform("metrics-image", "mi", "METRICSIMAGE", true, "Docker image of Prometheus.")]
-        public string MetricsImage { get; set; } = PrometheusContainerRecipe.DockerImage;
-
         [Uniform("kube-config", "kc", "KUBECONFIG", false, "Path to Kubeconfig file. Use 'null' (default) to use local cluster.")]
         public string KubeConfigFile { get; set; } = "null";
 
@@ -55,12 +41,12 @@ namespace CodexNetDeployer
         [Uniform("max-duration", "md", "MAXDURATION", true, "Maximum duration in seconds for contracts which will be accepted.")]
         public int MaxDuration { get; set; }
 
-        [Uniform("record-metrics", "rm", "RECORDMETRICS", false, "If true, metrics will be collected for all Codex nodes.")]
-        public bool RecordMetrics { get; set; } = false;
-       
         [Uniform("block-ttl", "bt", "BLOCKTTL", false, "Block timeout in seconds. Default is 24 hours.")]
         public int BlockTTL { get; set; } = SecondsIn1Day;
 
+        [Uniform("record-metrics", "rm", "RECORDMETRICS", false, "If true, metrics will be collected for all Codex nodes.")]
+        public bool RecordMetrics { get; set; } = false;
+       
         public TestRunnerLocation RunnerLocation { get; set; } = TestRunnerLocation.InternalToCluster;
 
         public List<string> Validate()
diff --git a/CodexNetDeployer/Deployer.cs b/CodexNetDeployer/Deployer.cs
index 04c39d1..e7180a6 100644
--- a/CodexNetDeployer/Deployer.cs
+++ b/CodexNetDeployer/Deployer.cs
@@ -101,10 +101,6 @@ namespace CodexNetDeployer
         private DeploymentMetadata CreateMetadata()
         {
             return new DeploymentMetadata(
-                codexImage: config.CodexImage,
-                gethImage: config.GethImage,
-                contractsImage: config.ContractsImage,
-                prometheusImage: config.MetricsImage,
                 kubeNamespace: config.KubeNamespace,
                 numberOfCodexNodes: config.NumberOfCodexNodes!.Value,
                 numberOfValidators: config.NumberOfValidators!.Value,
diff --git a/DistTestCore/Codex/CodexDeployment.cs b/DistTestCore/Codex/CodexDeployment.cs
index 39aa689..52192dc 100644
--- a/DistTestCore/Codex/CodexDeployment.cs
+++ b/DistTestCore/Codex/CodexDeployment.cs
@@ -21,13 +21,9 @@ namespace DistTestCore.Codex
 
     public class DeploymentMetadata
     {
-        public DeploymentMetadata(string codexImage, string gethImage, string contractsImage, string prometheusImage, string kubeNamespace, int numberOfCodexNodes, int numberOfValidators, int storageQuotaMB, CodexLogLevel codexLogLevel, int initialTestTokens, int minPrice, int maxCollateral, int maxDuration)
+        public DeploymentMetadata(string kubeNamespace, int numberOfCodexNodes, int numberOfValidators, int storageQuotaMB, CodexLogLevel codexLogLevel, int initialTestTokens, int minPrice, int maxCollateral, int maxDuration)
         {
             DeployDateTimeUtc = DateTime.UtcNow;
-            CodexImage = codexImage;
-            GethImage = gethImage;
-            ContractsImage = contractsImage;
-            PrometheusImage = prometheusImage;
             KubeNamespace = kubeNamespace;
             NumberOfCodexNodes = numberOfCodexNodes;
             NumberOfValidators = numberOfValidators;
@@ -39,11 +35,7 @@ namespace DistTestCore.Codex
             MaxDuration = maxDuration;
         }
 
-        public string CodexImage { get; }
         public DateTime DeployDateTimeUtc { get; }
-        public string GethImage { get; }
-        public string ContractsImage { get; }
-        public string PrometheusImage { get; }
         public string KubeNamespace { get; }
         public int NumberOfCodexNodes { get; }
         public int NumberOfValidators { get; }