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

Get ports explicitly for internal or external endpoints

This commit is contained in:
benbierens 2023-11-06 16:52:55 +01:00
parent ad88560061
commit 1412dd84fe
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Framework/KubernetesWorkflow/RunningContainers.cs
View File

@ -64,8 +64,7 @@ namespace KubernetesWorkflow
public Address GetInternalAddress(string portTag) public Address GetInternalAddress(string portTag)
{ {
var containerAddress = Addresses.Single(a => a.PortTag == portTag); var containerAddress = Addresses.Single(a => a.PortTag == portTag && a.IsInteral);
if (!containerAddress.IsInteral) throw new Exception(portTag + " refers to an external port");
return containerAddress.Address; return containerAddress.Address;
} }
} }

9
Framework/KubernetesWorkflow/RunningPod.cs
View File

@ -29,7 +29,7 @@ namespace KubernetesWorkflow
[JsonIgnore] [JsonIgnore]
internal RunnerLocation RunnerLocation { get; set; } internal RunnerLocation RunnerLocation { get; set; }
public Port GetServicePorts(ContainerRecipe recipe, string tag) public Port GetInternalServicePorts(ContainerRecipe recipe, string tag)
{ {
if (InternalService != null) if (InternalService != null)
{ {
@ -37,13 +37,18 @@ namespace KubernetesWorkflow
if (p != null) return p; if (p != null) return p;
} }
throw new Exception($"Unable to find internal port by tag '{tag}' for recipe '{recipe.Name}'.");
}
public Port GetExternalServicePorts(ContainerRecipe recipe, string tag)
{
if (ExternalService != null) if (ExternalService != null)
{ {
var p = ExternalService.GetServicePortForRecipeAndTag(recipe, tag); var p = ExternalService.GetServicePortForRecipeAndTag(recipe, tag);
if (p != null) return p; if (p != null) return p;
} }
throw new Exception($"Unable to find port by tag '{tag}' for recipe '{recipe.Name}'."); throw new Exception($"Unable to find external port by tag '{tag}' for recipe '{recipe.Name}'.");
} }
public Port[] GetServicePortsForContainer(ContainerRecipe recipe) public Port[] GetServicePortsForContainer(ContainerRecipe recipe)

5
Framework/KubernetesWorkflow/StartupWorkflow.cs
View File

@ -151,6 +151,7 @@ namespace KubernetesWorkflow
foreach (var exposedPort in recipe.ExposedPorts) foreach (var exposedPort in recipe.ExposedPorts)
{ {
result.Add(new ContainerAddress(exposedPort.Tag, GetContainerExternalAddress(startResult, recipe, exposedPort.Tag), false)); result.Add(new ContainerAddress(exposedPort.Tag, GetContainerExternalAddress(startResult, recipe, exposedPort.Tag), false));
result.Add(new ContainerAddress(exposedPort.Tag, GetContainerInternalAddress(startResult, recipe, exposedPort.Tag), true));
} }
foreach (var internalPort in recipe.InternalPorts) foreach (var internalPort in recipe.InternalPorts)
{ {
@ -162,7 +163,7 @@ namespace KubernetesWorkflow
private static Address GetContainerExternalAddress(StartResult startResult, ContainerRecipe recipe, string tag) private static Address GetContainerExternalAddress(StartResult startResult, ContainerRecipe recipe, string tag)
{ {
var port = startResult.GetServicePorts(recipe, tag); var port = startResult.GetExternalServicePorts(recipe, tag);
return new Address( return new Address(
startResult.Cluster.HostAddress, startResult.Cluster.HostAddress,
@ -172,7 +173,7 @@ namespace KubernetesWorkflow
private Address GetContainerInternalAddress(StartResult startResult, ContainerRecipe recipe, string tag) private Address GetContainerInternalAddress(StartResult startResult, ContainerRecipe recipe, string tag)
{ {
var serviceName = startResult.InternalService!.Name; var serviceName = startResult.InternalService!.Name;
var port = startResult.GetServicePorts(recipe, tag); var port = startResult.GetInternalServicePorts(recipe, tag);
return new Address( return new Address(
$"http://{serviceName}", $"http://{serviceName}",
port.Number); port.Number);