Skip to content

Commit 3ab59b0

Browse files
committed
Merge remote-tracking branch 'origin/release-v2-dev' into fix/conformance-test-case-HTTPRouteInvalidCrossNamespaceParentRef
# Conflicts: # test/conformance/conformance_test.go
2 parents 4c7303a + 5fa6c01 commit 3ab59b0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

internal/controller/utils.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"slices"
2222
"strings"
2323

24-
"github.com/api7/gopkg/pkg/log"
2524
"github.com/samber/lo"
2625
"go.uber.org/zap"
2726
corev1 "k8s.io/api/core/v1"
@@ -33,6 +32,8 @@ import (
3332
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3433
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3534

35+
"github.com/api7/gopkg/pkg/log"
36+
3637
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
3738
"github.com/apache/apisix-ingress-controller/internal/controller/config"
3839
"github.com/apache/apisix-ingress-controller/internal/provider"
@@ -262,6 +263,9 @@ func SetRouteConditionResolvedRefs(routeParentStatus *gatewayv1.RouteParentStatu
262263
if !status && strings.Contains(message, string(gatewayv1.RouteReasonInvalidKind)) {
263264
reason = string(gatewayv1.RouteReasonInvalidKind)
264265
}
266+
if !status && strings.Contains(message, "Service") && strings.Contains(message, "not found") {
267+
reason = string(gatewayv1.RouteReasonBackendNotFound)
268+
}
265269

266270
condition := metav1.Condition{
267271
Type: string(gatewayv1.RouteConditionResolvedRefs),

test/conformance/conformance_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ var skippedTestsForTraditionalRoutes = []string{
3636
// TODO: HTTPRoute hostname intersection and listener hostname matching
3737

3838
tests.GatewayInvalidTLSConfiguration.ShortName,
39-
tests.HTTPRouteInvalidNonExistentBackendRef.ShortName,
4039
tests.HTTPRouteInvalidParentRefNotMatchingSectionName.ShortName,
4140
}
4241

0 commit comments

Comments
 (0)