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
+3 −3
Merged

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

Changes from 2 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
5 changes: 3 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,8 +374,9 @@ 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());
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: new line not needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤨

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx, that will teach me to double check when editing directly from the portal :D
(Not on the head please)

}
}

Expand Down