fix multiple egress hosts select same service error (#33766)

istio · Jul 2, 2021 · d4255f0 · d4255f0
1 parent 8dd4a1f
commit d4255f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pilot/pkg/model/sidecar.go b/pilot/pkg/model/sidecar.go
@@ -659,10 +659,7 @@ func (ilw *IstioEgressListenerWrapper) selectServices(services []*Service, confi
 			if svc := matchingService(importedHosts, s, ilw); svc != nil {
 				importedServices = append(importedServices, svc)
 			}
-		}
-
-		// Check if there is an import of form */host or */*
-		if wnsFound {
+		} else if wnsFound { // Check if there is an import of form */host or */*
 			if svc := matchingService(wildcardHosts, s, ilw); svc != nil {
 				importedServices = append(importedServices, svc)
 			}

diff --git a/pilot/pkg/model/sidecar_test.go b/pilot/pkg/model/sidecar_test.go
@@ -1389,6 +1389,13 @@ func TestIstioEgressListenerWrapper(t *testing.T) {
 			expected:      []*Service{},
 			namespace:     "a",
 		},
+		{
+			name:          "multiple hosts selected same service",
+			listenerHosts: map[string][]host.Name{"a": {wildcardService}, "*": {wildcardService}},
+			services:      []*Service{serviceA8000},
+			expected:      []*Service{serviceA8000},
+			namespace:     "a",
+		},
 	}
 
 	for _, tt := range tests {