Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

Map "binding.ContainerPort" instead of "binding.Port" to "manifest containerPort" #740

Merged
merged 4 commits into from
Nov 3, 2020
Merged

Map "binding.ContainerPort" instead of "binding.Port" to "manifest containerPort" #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf89725
Mapping "binding.ContainerPort" instead of "binding.Port" to "manifes…
tebeco Oct 31, 2020
3b8b64f
cleanup comment after first review
tebeco Nov 2, 2020
0f3649f
lint
tebeco Nov 2, 2020
8d550c2
prefer binding.ContainerPort before binding.Port for ASPNETCORE_URLS
tebeco Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.Tye.Core/CombineStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public override Task ExecuteAsync(OutputContext output, ApplicationBuilder appli

if (binding.Protocol == "http")
{
var port = binding.Port ?? 80;
var port = binding.ContainerPort ?? binding.Port ?? 80;
var urls = $"http://*{(port == 80 ? "" : (":" + port.ToString()))}";
project.EnvironmentVariables.Add(new EnvironmentVariableBuilder("ASPNETCORE_URLS") { Value = urls, });
project.EnvironmentVariables.Add(new EnvironmentVariableBuilder("PORT") { Value = port.ToString(CultureInfo.InvariantCulture), });
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public static KubernetesServiceOutput CreateService(
port.Add("name", binding.Name ?? binding.Protocol ?? "http");
port.Add("protocol", "TCP"); // we use assume TCP. YOLO
port.Add("port", binding.Port.Value.ToString());
port.Add("targetPort", binding.Port.Value.ToString());
port.Add("targetPort", (binding.ContainerPort ?? binding.Port.Value).ToString());
}
}

Expand Down Expand Up @@ -374,7 +374,7 @@ public static KubernetesDeploymentOutput CreateDeployment(
{
var containerPort = new YamlMappingNode();
ports.Add(containerPort);
containerPort.Add("containerPort", binding.Port.Value.ToString());
containerPort.Add("containerPort", (binding.ContainerPort ?? binding.Port.Value).ToString());
}
}
}
Expand Down