github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1145 from anovateam/route_port_on_delegation

Browse Source 
istio: Add destination port when port discovery and delegation are true
This commit is contained in:
Stefan Prodan
2022-03-18 10:10:54 +02:00
committed by GitHub
parent eca6fa7958 c7cbb729b7
commit 08deddc4fe
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/istio.go
+2 -2
View File
@@ -488,8 +488,8 @@ func makeDestination(canary *flaggerv1.Canary, host string, weight int) istiov1a
// set destination port when an ingress gateway is specified
if canary.Spec.Service.PortDiscovery &&
len(canary.Spec.Service.Gateways) > 0 &&
canary.Spec.Service.Gateways[0] != "mesh" {
(len(canary.Spec.Service.Gateways) > 0 &&
canary.Spec.Service.Gateways[0] != "mesh" || canary.Spec.Service.Delegation) {
dest = istiov1alpha3.DestinationWeight{
Destination: istiov1alpha3.Destination{
Host: host,
pkg/router/istio_test.go
+3
View File
@@ -372,6 +372,9 @@ func TestIstioRouter_Delegate(t *testing.T) {
assert.Equal(t, 0, len(vs.Spec.Hosts))
assert.Equal(t, 0, len(vs.Spec.Gateways))
port := vs.Spec.Http[0].Route[0].Destination.Port.Number
assert.Equal(t, uint32(mocks.canary.Spec.Service.Port), port)
})
t.Run("invalid", func(t *testing.T) {