codex-storage
/
cs-codex-dist-tests
mirror of https://github.com/codex-storage/cs-codex-dist-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/codex-net-deployer 

# Conflicts:
#	DistTestCore/Marketplace/MarketplaceAccess.cs
This commit is contained in:
benbierens 2023-07-12 14:55:42 +02:00
parent 512aeb79a0 66161e8d41
commit 1ef65f00f9
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
DistTestCore/Codex/CodexContainerRecipe.cs
View File

@ -1,15 +1,16 @@
using DistTestCore.Marketplace; using DistTestCore.Marketplace;
using KubernetesWorkflow; using KubernetesWorkflow;
using System.Net.Sockets;
namespace DistTestCore.Codex namespace DistTestCore.Codex
{ {
public class CodexContainerRecipe : ContainerRecipeFactory public class CodexContainerRecipe : ContainerRecipeFactory
{ {
#if Arm64 #if Arm64
public const string DockerImage = "codexstorage/nim-codex:sha-7b88ea0"; public const string DockerImage = "codexstorage/nim-codex:sha-f053135";
#else #else
public const string DockerImage = "thatbenbierens/nim-codex:dhting"; //public const string DockerImage = "thatbenbierens/nim-codex:dhting";
//public const string DockerImage = "codexstorage/nim-codex:sha-7b88ea0"; public const string DockerImage = "codexstorage/nim-codex:sha-f053135";
#endif #endif
public const string MetricsPortTag = "metrics_port"; public const string MetricsPortTag = "metrics_port";
public const string DiscoveryPortTag = "discovery-port"; public const string DiscoveryPortTag = "discovery-port";
@ -24,21 +25,26 @@ namespace DistTestCore.Codex
{ {
var config = startupConfig.Get<CodexStartupConfig>(); var config = startupConfig.Get<CodexStartupConfig>();
AddExposedPortAndVar("API_PORT"); AddExposedPortAndVar("CODEX_API_PORT");
AddEnvVar("DATA_DIR", $"datadir{ContainerNumber}"); AddEnvVar("CODEX_API_BINDADDR", "0.0.0.0");
AddInternalPortAndVar("DISC_PORT", DiscoveryPortTag);
AddEnvVar("LOG_LEVEL", config.LogLevel.ToString()!.ToUpperInvariant()); AddEnvVar("CODEX_DATA_DIR", $"datadir{ContainerNumber}");
AddInternalPortAndVar("CODEX_DISC_PORT", DiscoveryPortTag);
AddEnvVar("CODEX_LOG_LEVEL", config.LogLevel.ToString()!.ToUpperInvariant());
// This makes the node announce itself to its local (pod) IP address.
AddEnvVar("CODEX_NAT_ADDR", "$(hostname --ip-address)");
var listenPort = AddInternalPort(); var listenPort = AddInternalPort();
AddEnvVar("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))
{ {
AddEnvVar("BOOTSTRAP_SPR", config.BootstrapSpr); AddEnvVar("CODEX_BOOTSTRAP_NODE", config.BootstrapSpr);
} }
if (config.StorageQuota != null) if (config.StorageQuota != null)
{ {
AddEnvVar("STORAGE_QUOTA", config.StorageQuota.SizeInBytes.ToString()!); AddEnvVar("CODEX_STORAGE_QUOTA", config.StorageQuota.SizeInBytes.ToString()!);
} }
if (config.BlockTTL != null) if (config.BlockTTL != null)
{ {
@ -46,8 +52,9 @@ namespace DistTestCore.Codex
} }
if (config.MetricsEnabled) if (config.MetricsEnabled)
{ {
AddEnvVar("METRICS_ADDR", "0.0.0.0"); AddEnvVar("CODEX_METRICS", "true");
AddInternalPortAndVar("METRICS_PORT", tag: MetricsPortTag); AddEnvVar("CODEX_METRICS_ADDRESS", "0.0.0.0");
AddInternalPortAndVar("CODEX_METRICS_PORT", tag: MetricsPortTag);
} }
if (config.MarketplaceConfig != null) if (config.MarketplaceConfig != null)
@ -60,14 +67,14 @@ namespace DistTestCore.Codex
var ip = companionNode.RunningContainer.Pod.PodInfo.Ip; var ip = companionNode.RunningContainer.Pod.PodInfo.Ip;
var port = companionNode.RunningContainer.Recipe.GetPortByTag(GethContainerRecipe.HttpPortTag).Number; var port = companionNode.RunningContainer.Recipe.GetPortByTag(GethContainerRecipe.HttpPortTag).Number;
AddEnvVar("ETH_PROVIDER", $"ws://{ip}:{port}"); AddEnvVar("CODEX_ETH_PROVIDER", $"ws://{ip}:{port}");
AddEnvVar("ETH_ACCOUNT", companionNodeAccount.Account); AddEnvVar("CODEX_ETH_ACCOUNT", companionNodeAccount.Account);
AddEnvVar("ETH_MARKETPLACE_ADDRESS", gethConfig.MarketplaceNetwork.Marketplace.Address); AddEnvVar("CODEX_MARKETPLACE_ADDRESS", gethConfig.MarketplaceNetwork.Marketplace.Address);
AddEnvVar("PERSISTENCE", "1"); AddEnvVar("CODEX_PERSISTENCE", "true");
if (config.MarketplaceConfig.IsValidator) if (config.MarketplaceConfig.IsValidator)
{ {
AddEnvVar("VALIDATOR", "1"); AddEnvVar("CODEX_VALIDATOR", "true");
} }
} }
} }