From 5331046d7d9e3236907d4cecec1f6a2da9dbe6f0 Mon Sep 17 00:00:00 2001 From: TeBeCo Date: Tue, 3 Nov 2020 01:00:04 +0100 Subject: [PATCH] Map "binding.ContainerPort" instead of "binding.Port" to "manifest containerPort" (#740) --- src/Microsoft.Tye.Core/CombineStep.cs | 2 +- src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.Tye.Core/CombineStep.cs b/src/Microsoft.Tye.Core/CombineStep.cs index 56745841..895efcf0 100644 --- a/src/Microsoft.Tye.Core/CombineStep.cs +++ b/src/Microsoft.Tye.Core/CombineStep.cs @@ -38,7 +38,7 @@ namespace Microsoft.Tye 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), }); diff --git a/src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs b/src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs index 33e27e1c..d3cfeb25 100644 --- a/src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs +++ b/src/Microsoft.Tye.Core/KubernetesManifestGenerator.cs @@ -183,7 +183,7 @@ namespace Microsoft.Tye 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()); } } @@ -374,7 +374,7 @@ namespace Microsoft.Tye { var containerPort = new YamlMappingNode(); ports.Add(containerPort); - containerPort.Add("containerPort", binding.Port.Value.ToString()); + containerPort.Add("containerPort", (binding.ContainerPort ?? binding.Port.Value).ToString()); } } }