adressing comments p4

Kuadrant · Oct 3, 2023 · cb0ac5d · cb0ac5d
1 parent 969825d
commit cb0ac5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go b/pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go
@@ -201,7 +201,7 @@ func listenerTotalAttachedRoutes(upstreamGateway *gatewayv1beta1.Gateway, downst
 			if !found {
 				return 0
 			}
-			if clusterName == downstreamCluster && (listenerName == string(specListener.Name) || strings.Contains(string(*specListener.Hostname), "*")) {
+			if clusterName == downstreamCluster && listenerName == string(specListener.Name) {
 				return int(statusListener.AttachedRoutes)
 			}
 		}

diff --git a/test/integration/dnspolicy_controller_test.go b/test/integration/dnspolicy_controller_test.go
@@ -318,7 +318,14 @@ var _ = Describe("DNSPolicy", Ordered, func() {
 					return err
 				}
 				gateway.Status.Addresses = testBuildGatewayAddresses()
-				gateway.Status.Listeners = testBuildGatewayListenerStatus([]string{TestPlacedClusterControlName + "." + TestAttachedRouteName, TestPlaceClusterWorkloadName + "." + TestAttachedRouteName}, []int32{1, 1})
+				gateway.Status.Listeners = testBuildGatewayListenerStatus(
+					[]string{
+						TestPlacedClusterControlName + "." + TestAttachedRouteName,
+						TestPlaceClusterWorkloadName + "." + TestAttachedRouteName,
+						TestPlacedClusterControlName + "." + TestWildCardListenerName,
+						TestPlaceClusterWorkloadName + "." + TestWildCardListenerName,
+					},
+					[]int32{1, 1, 1, 1})
 				return k8sClient.Status().Update(ctx, gateway)
 			}, TestTimeoutMedium, TestRetryIntervalMedium).ShouldNot(HaveOccurred()) // end of the workaround
 		})
@@ -1276,8 +1283,9 @@ var _ = Describe("DNSPolicy", Ordered, func() {
 						Protocol: gatewayv1beta1.HTTPProtocolType,
 					}
 
-					patch = client.MergeFrom(gateway.DeepCopy())gateway.Spec.Listeners = append(gateway.Spec.Listeners, otherListener)
-					Expect(k8sClient.Patch(ctx, gateway, patch)).To(BeNil())
+					patch = client.MergeFrom(gateway.DeepCopy())
+						gateway.Spec.Listeners = append(gateway.Spec.Listeners, otherListener)
+						Expect(k8sClient.Patch(ctx, gateway, patch)).To(BeNil())
 
 					probeList := &v1alpha1.DNSHealthCheckProbeList{}
 					Eventually(func() error {