From b0b0cedde1c1f5f4b328b37313d4346f4b4f6474 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 13 May 2020 17:26:36 +0300 Subject: [PATCH] Map target port for virtual node listeners --- pkg/router/appmesh_v1beta2.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/router/appmesh_v1beta2.go b/pkg/router/appmesh_v1beta2.go index ad56f27b..5e496883 100644 --- a/pkg/router/appmesh_v1beta2.go +++ b/pkg/router/appmesh_v1beta2.go @@ -81,7 +81,7 @@ func (ar *AppMeshv1beta2Router) reconcileVirtualNode(canary *flaggerv1.Canary, n Listeners: []appmeshv1.Listener{ { PortMapping: appmeshv1.PortMapping{ - Port: appmeshv1.PortNumber(canary.Spec.Service.Port), + Port: ar.getContainerPort(canary), Protocol: protocol, }, }, @@ -507,6 +507,14 @@ func (ar *AppMeshv1beta2Router) getProtocol(canary *flaggerv1.Canary) appmeshv1. return appmeshv1.PortProtocolHTTP } +func (ar *AppMeshv1beta2Router) getContainerPort(canary *flaggerv1.Canary) appmeshv1.PortNumber { + containerPort := canary.Spec.Service.Port + if canary.Spec.Service.TargetPort.IntVal > 0 { + containerPort = canary.Spec.Service.TargetPort.IntVal + } + return appmeshv1.PortNumber(containerPort) +} + func (ar *AppMeshv1beta2Router) gatewayAnnotations(canary *flaggerv1.Canary) map[string]string { a := make(map[string]string) domains := ""