codex-storage/cs-codex-dist-tests
1
0
Fork 0
mirror of https://github.com/codex-storage/cs-codex-dist-tests.git synced 2025-02-02 23:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mandatory port tags for exposed ports

Browse Source
This commit is contained in:
benbierens 2023-10-19 11:12:08 +02:00
parent 3a8bb760ef
commit 43fa57dc97
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Framework/KubernetesWorkflow/ContainerRecipe.cs
View File

@ -24,6 +24,8 @@
{ {
Name = $"ctnr{Number}"; Name = $"ctnr{Number}";
} }
if (exposedPorts.Any(p => string.IsNullOrEmpty(p.Tag))) throw new Exception("Port tags are required for all exposed ports.");
} }
public string Name { get; } public string Name { get; }

6
Framework/KubernetesWorkflow/ContainerRecipeFactory.cs
View File

@ -50,12 +50,12 @@ namespace KubernetesWorkflow
protected int Index { get; private set; } = 0; protected int Index { get; private set; } = 0;
protected abstract void Initialize(StartupConfig config); protected abstract void Initialize(StartupConfig config);
protected Port AddExposedPort(string tag = "") protected Port AddExposedPort(string tag)
{ {
return AddExposedPort(factory.CreatePort(tag)); return AddExposedPort(factory.CreatePort(tag));
} }
protected Port AddExposedPort(int number, string tag = "") protected Port AddExposedPort(int number, string tag)
{ {
return AddExposedPort(factory.CreatePort(number, tag)); return AddExposedPort(factory.CreatePort(number, tag));
} }
@ -67,7 +67,7 @@ namespace KubernetesWorkflow
return p; return p;
} }
protected void AddExposedPortAndVar(string name, string tag = "") protected void AddExposedPortAndVar(string name, string tag)
{ {
AddEnvVar(name, AddExposedPort(tag)); AddEnvVar(name, AddExposedPort(tag));
} }

10
ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs
View File

@ -8,8 +8,10 @@ namespace CodexPlugin
private readonly MarketplaceStarter marketplaceStarter = new MarketplaceStarter(); private readonly MarketplaceStarter marketplaceStarter = new MarketplaceStarter();
private const string DefaultDockerImage = "codexstorage/nim-codex:latest-dist-tests"; private const string DefaultDockerImage = "codexstorage/nim-codex:latest-dist-tests";
public const string MetricsPortTag = "metrics_port"; public const string ApiPortTag = "codex_api_port";
public const string DiscoveryPortTag = "discovery-port"; public const string ListenPortTag = "codex_listen_port";
public const string MetricsPortTag = "codex_metrics_port";
public const string DiscoveryPortTag = "codex_discovery_port";
// Used by tests for time-constraint assertions. // Used by tests for time-constraint assertions.
public static readonly TimeSpan MaxUploadTimePerMegabyte = TimeSpan.FromSeconds(2.0); public static readonly TimeSpan MaxUploadTimePerMegabyte = TimeSpan.FromSeconds(2.0);
@ -27,7 +29,7 @@ namespace CodexPlugin
var config = startupConfig.Get<CodexStartupConfig>(); var config = startupConfig.Get<CodexStartupConfig>();
AddExposedPortAndVar("CODEX_API_PORT"); AddExposedPortAndVar("CODEX_API_PORT", ApiPortTag);
AddEnvVar("CODEX_API_BINDADDR", "0.0.0.0"); AddEnvVar("CODEX_API_BINDADDR", "0.0.0.0");
var dataDir = $"datadir{ContainerNumber}"; var dataDir = $"datadir{ContainerNumber}";
@ -40,7 +42,7 @@ namespace CodexPlugin
// This makes the node announce itself to its local (pod) IP address. // This makes the node announce itself to its local (pod) IP address.
AddEnvVar("NAT_IP_AUTO", "true"); AddEnvVar("NAT_IP_AUTO", "true");
var listenPort = AddExposedPort(); var listenPort = AddExposedPort(ListenPortTag);
AddEnvVar("CODEX_LISTEN_ADDRS", $"/ip4/0.0.0.0/tcp/{listenPort.Number}"); AddEnvVar("CODEX_LISTEN_ADDRS", $"/ip4/0.0.0.0/tcp/{listenPort.Number}");
if (!string.IsNullOrEmpty(config.BootstrapSpr)) if (!string.IsNullOrEmpty(config.BootstrapSpr))

4
ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs
View File

@ -7,11 +7,13 @@ namespace MetricsPlugin
public override string AppName => "prometheus"; public override string AppName => "prometheus";
public override string Image => "codexstorage/dist-tests-prometheus:latest"; public override string Image => "codexstorage/dist-tests-prometheus:latest";
public const string PortTag = "prometheus_port_tag";
protected override void Initialize(StartupConfig startupConfig) protected override void Initialize(StartupConfig startupConfig)
{ {
var config = startupConfig.Get<PrometheusStartupConfig>(); var config = startupConfig.Get<PrometheusStartupConfig>();
AddExposedPortAndVar("PROM_PORT"); AddExposedPortAndVar("PROM_PORT", PortTag);
AddEnvVar("PROM_CONFIG", config.PrometheusConfigBase64); AddEnvVar("PROM_CONFIG", config.PrometheusConfigBase64);
} }
} }