test: removed duplicate tests

Signed-off-by: Kostis Kapelonis <kostis.kapelonis@octopus.com>

Author: kostis-codefresh

pkg/plugin/grpcroute.go

@@ -102,7 +102,19 @@ func (r *RpcPlugin) setGRPCHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
 
 		canaryServiceKind := gatewayv1.Kind("Service")
 		canaryServiceGroup := gatewayv1.Group("")
-		grpcRouteRuleList := GRPCRouteRuleList(grpcRoute.Spec.Rules)
+
+		// Filter to only unmanaged rules (rules without a Name, or with a Name not in managedRoutes)
+		// This ensures getRouteRule only searches through weight-splitting rules, not header routes
+		managedNames := managedRouteNamesSet(rollout)
+		unmanagedRules := []gatewayv1.GRPCRouteRule{}
+		for _, rule := range grpcRoute.Spec.Rules {
+			// Keep rules that have no name OR have a name that's not managed
+			if rule.Name == nil || !managedNames[string(*rule.Name)] {
+				unmanagedRules = append(unmanagedRules, rule)
+			}
+		}
+
+		grpcRouteRuleList := GRPCRouteRuleList(unmanagedRules)
 		backendRefNameList := []string{string(canaryServiceName), stableServiceName}
 		grpcRouteRule, err := getRouteRule(grpcRouteRuleList, backendRefNameList...)
 		if err != nil {

pkg/plugin/httproute.go

@@ -107,7 +107,19 @@ func (r *RpcPlugin) setHTTPHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
 
 		canaryServiceKind := gatewayv1.Kind("Service")
 		canaryServiceGroup := gatewayv1.Group("")
-		httpRouteRuleList := HTTPRouteRuleList(httpRoute.Spec.Rules)
+
+		// Filter to only unmanaged rules (rules without a Name, or with a Name not in managedRoutes)
+		// This ensures getRouteRule only searches through weight-splitting rules, not header routes
+		managedNames := managedRouteNamesSet(rollout)
+		unmanagedRules := []gatewayv1.HTTPRouteRule{}
+		for _, rule := range httpRoute.Spec.Rules {
+			// Keep rules that have no name OR have a name that's not managed
+			if rule.Name == nil || !managedNames[string(*rule.Name)] {
+				unmanagedRules = append(unmanagedRules, rule)
+			}
+		}
+
+		httpRouteRuleList := HTTPRouteRuleList(unmanagedRules)
 		backendRefNameList := []string{string(canaryServiceName), stableServiceName}
 		httpRouteRule, err := getRouteRule(httpRouteRuleList, backendRefNameList...)
 		if err != nil {