@@ -73,7 +73,7 @@ var RateLimitCIDRMatchTest = suite.ConformanceTest{
7373 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
7474 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
7575 // Wait for the ratelimit server to be running and ready.
76- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
76+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
7777 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
7878 types.NamespacedName {Name : "ratelimit-all-ips" , Namespace : ns },
7979 suite .ControllerName , gwapiv1.ParentReference {
@@ -139,7 +139,7 @@ var RateLimitCIDRInvertMatchAlwaysEnforceTest = suite.ConformanceTest{
139139 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
140140 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
141141 // Wait for the ratelimit server to be running and ready.
142- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
142+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
143143 ratelimitHeader := make (map [string ]string )
144144 expectOkResp := http.ExpectedResponse {
145145 Request : http.Request {
@@ -207,7 +207,7 @@ var RateLimitCIDRInvertAlwaysExemptTest = suite.ConformanceTest{
207207 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
208208 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
209209 // Wait for the ratelimit server to be running and ready.
210- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
210+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
211211 expectOkResp := http.ExpectedResponse {
212212 Request : http.Request {
213213 Path : "/never-limited" ,
@@ -239,7 +239,7 @@ var RateLimitMethodMatchTest = suite.ConformanceTest{
239239 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
240240 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
241241 // Wait for the ratelimit server to be running and ready.
242- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
242+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
243243
244244 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
245245 types.NamespacedName {Name : "ratelimit-method-match" , Namespace : ns },
@@ -330,7 +330,7 @@ var RateLimitPathMatchTest = suite.ConformanceTest{
330330 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
331331 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
332332 // Wait for the ratelimit server to be running and ready.
333- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
333+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
334334
335335 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
336336 types.NamespacedName {Name : "ratelimit-path-match" , Namespace : ns },
@@ -448,7 +448,7 @@ var RateLimitHeaderMatchTest = suite.ConformanceTest{
448448 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
449449 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
450450 // Wait for the ratelimit server to be running and ready.
451- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
451+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
452452
453453 // TODO: this seems not right,
454454 // BTP targets to HTTPRoute instead of Gateway,
@@ -536,7 +536,7 @@ var GlobalRateLimitHeaderInvertMatchTest = suite.ConformanceTest{
536536 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
537537 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
538538 // Wait for the ratelimit server to be running and ready.
539- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
539+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
540540
541541 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
542542 types.NamespacedName {Name : "ratelimit-anded-headers-with-invert" , Namespace : ns },
@@ -634,7 +634,7 @@ var RateLimitHeadersDisabled = suite.ConformanceTest{
634634 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
635635 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
636636 // Wait for the ratelimit server to be running and ready.
637- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
637+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
638638
639639 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
640640 types.NamespacedName {Name : "ratelimit-headers-disabled-btp" , Namespace : ns },
@@ -734,7 +734,7 @@ var RateLimitBasedJwtClaimsTest = suite.ConformanceTest{
734734 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
735735 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
736736 // Wait for the ratelimit server to be running and ready.
737- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
737+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
738738
739739 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
740740 types.NamespacedName {Name : "ratelimit-specific-user" , Namespace : ns },
@@ -878,7 +878,7 @@ var RateLimitMultipleListenersTest = suite.ConformanceTest{
878878 gwNN := types.NamespacedName {Name : "eg-rate-limit" , Namespace : ns }
879879 gwHost := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
880880 // Wait for the ratelimit server to be running and ready.
881- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
881+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
882882
883883 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
884884 types.NamespacedName {Name : "ratelimit-all-ips" , Namespace : ns },
@@ -944,7 +944,7 @@ var RateLimitHeadersAndCIDRMatchTest = suite.ConformanceTest{
944944 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
945945 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
946946 // Wait for the ratelimit server to be running and ready.
947- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
947+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
948948
949949 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
950950 types.NamespacedName {Name : "ratelimit-headers-and-cidr" , Namespace : ns },
@@ -1071,7 +1071,7 @@ var UsageRateLimitTest = suite.ConformanceTest{
10711071 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
10721072 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
10731073 // Wait for the ratelimit server to be running and ready.
1074- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
1074+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
10751075
10761076 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
10771077 types.NamespacedName {Name : "usage-rate-limit" , Namespace : ns },
@@ -1151,7 +1151,7 @@ var RateLimitGlobalSharedCidrMatchTest = suite.ConformanceTest{
11511151 // Get gateway address for the second route
11521152 gwAddr2 := kubernetes .GatewayAndHTTPRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), route2NN )
11531153 // Wait for the ratelimit server to be running and ready.
1154- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
1154+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
11551155
11561156 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
11571157 types.NamespacedName {Name : "ratelimit-all-ips" , Namespace : ns },
@@ -1230,7 +1230,7 @@ var RateLimitGlobalSharedGatewayHeaderMatchTest = suite.ConformanceTest{
12301230 // Get gateway address for the second route
12311231 gwAddr2 := kubernetes .GatewayAndHTTPRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), route2NN )
12321232 // Wait for the ratelimit server to be running and ready.
1233- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
1233+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
12341234
12351235 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
12361236 types.NamespacedName {Name : "ratelimit-header-match-gateway" , Namespace : ns },
@@ -1343,7 +1343,7 @@ var RateLimitGlobalMergeTest = suite.ConformanceTest{
13431343 gwAddr1 := kubernetes .GatewayAndHTTPRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), route1NN )
13441344 gwAddr2 := kubernetes .GatewayAndHTTPRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), route2NN )
13451345 // Wait for the ratelimit server to be running and ready.
1346- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
1346+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
13471347
13481348 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
13491349 types.NamespacedName {Name : "ratelimit-headers-route-policy" , Namespace : ns },
@@ -1543,7 +1543,7 @@ var RateLimitGlobalShadowModeTest = suite.ConformanceTest{
15431543 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
15441544 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , shadowRouteNN )
15451545 // Wait for the ratelimit server to be running and ready.
1546- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
1546+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
15471547
15481548 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
15491549 types.NamespacedName {Name : "shadow-mode-ratelimit" , Namespace : ns },
@@ -1599,7 +1599,7 @@ var RateLimitQueryParametersTest = suite.ConformanceTest{
15991599 gwNN := types.NamespacedName {Name : "same-namespace" , Namespace : ns }
16001600 gwAddr := kubernetes .GatewayAndRoutesMustBeAccepted (t , suite .Client , suite .TimeoutConfig , suite .ControllerName , kubernetes .NewGatewayRef (gwNN ), & gwapiv1.HTTPRoute {}, false , routeNN )
16011601 // Wait for the ratelimit server to be running and ready.
1602- WaitForPods (t , suite .Client , ns , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
1602+ WaitForPods (t , suite .Client ,"envoy-gateway-system" , map [string ]string {"app.kubernetes.io/component" : "ratelimit" }, corev1 .PodRunning , & PodReady )
16031603
16041604 BackendTrafficPolicyMustBeAccepted (t , suite .Client ,
16051605 types.NamespacedName {Name : "ratelimit-query-parameters" , Namespace : ns },
0 commit comments