Merge branch 'devel' into k8s_128

submariner-io · Dec 15, 2023 · 41d8f2a · 41d8f2a
2 parents 576529b + dbe4b88
commit 41d8f2a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/coredns/resolver/controller.go b/coredns/resolver/controller.go
@@ -120,7 +120,7 @@ func (c *controller) getAllEndpointSlices(forEPS *discovery.EndpointSlice) []*di
 	var epSlices []*discovery.EndpointSlice
 	for i := range list {
 		eps := list[i].(*discovery.EndpointSlice)
-		if !isLegacyEndpointSlice(eps) {
+		if !isOnBroker(eps) && !isLegacyEndpointSlice(eps) {
 			epSlices = append(epSlices, eps)
 		}
 	}
@@ -157,8 +157,11 @@ func (c *controller) onServiceImportDelete(obj runtime.Object, _ int) bool {
 }
 
 func (c *controller) ignoreEndpointSlice(eps *discovery.EndpointSlice) bool {
-	isOnBroker := eps.Namespace != eps.Labels[constants.LabelSourceNamespace]
-	return isOnBroker || (isLegacyEndpointSlice(eps) && len(c.getAllEndpointSlices(eps)) > 0)
+	return isOnBroker(eps) || (isLegacyEndpointSlice(eps) && len(c.getAllEndpointSlices(eps)) > 0)
+}
+
+func isOnBroker(eps *discovery.EndpointSlice) bool {
+	return eps.Namespace != eps.Labels[constants.LabelSourceNamespace]
 }
 
 func isLegacyEndpointSlice(eps *discovery.EndpointSlice) bool {

diff --git a/coredns/resolver/controller_test.go b/coredns/resolver/controller_test.go
@@ -134,6 +134,10 @@ var _ = Describe("Controller", func() {
 			)
 			epsName2 = eps.Name
 			t.createEndpointSlice(eps)
+
+			epsOnBroker := eps.DeepCopy()
+			epsOnBroker.Namespace = test.RemoteNamespace
+			t.createEndpointSlice(epsOnBroker)
 		})
 
 		Specify("GetDNSRecords should return their DNS record", func() {

diff --git a/coredns/resolver/resolver_suite_test.go b/coredns/resolver/resolver_suite_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package resolver_test
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"reflect"
@@ -175,12 +176,13 @@ func (t *testDriver) awaitDNSRecordsFound(ns, name, cluster, hostname string, ex
 	var records []resolver.DNSRecord
 	var found, isHeadless bool
 
-	err := wait.PollImmediate(50*time.Millisecond, 5*time.Second, func() (bool, error) {
-		records, isHeadless, found = t.resolver.GetDNSRecords(ns, name, cluster, hostname)
-		sortRecords(records)
+	err := wait.PollUntilContextTimeout(context.Background(), 50*time.Millisecond, 5*time.Second, true,
+		func(_ context.Context) (bool, error) {
+			records, isHeadless, found = t.resolver.GetDNSRecords(ns, name, cluster, hostname)
+			sortRecords(records)
 
-		return found && isHeadless == expIsHeadless && reflect.DeepEqual(records, expRecords), nil
-	})
+			return found && isHeadless == expIsHeadless && reflect.DeepEqual(records, expRecords), nil
+		})
 	if err == nil {
 		return
 	}

diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
@@ -723,13 +723,13 @@ func (f *Framework) VerifyIPsWithDig(cluster framework.ClusterIndex, service *v1
 			return false, fmt.Sprintf("expected execution result %q to be empty", result), nil
 		}
 		for _, ip := range ipList {
-			doesContain := strings.Contains(result.(string), ip)
-			if doesContain && !shouldContain {
+			count := strings.Count(result.(string), ip)
+			if count > 0 && !shouldContain {
 				return false, fmt.Sprintf("expected execution result %q not to contain %q", result, ip), nil
 			}
 
-			if !doesContain && shouldContain {
-				return false, fmt.Sprintf("expected execution result %q to contain %q", result, ip), nil
+			if count != 1 && shouldContain {
+				return false, fmt.Sprintf("expected execution result %q to contain one occurrence of %q", result, ip), nil
 			}
 		}