Skip to content

Commit ac4d9da

Browse files
committed
Revert "Merge pull request #1694 from mlavacca/parentref-not-permitted-conformance"
This reverts commit 419ce85.
1 parent b5c106e commit ac4d9da

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

conformance/tests/httproute-invalid-cross-namespace-parent-ref.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ package tests
1919
import (
2020
"testing"
2121

22-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2322
"k8s.io/apimachinery/pkg/types"
2423

25-
"sigs.k8s.io/gateway-api/apis/v1beta1"
2624
"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
2725
"sigs.k8s.io/gateway-api/conformance/utils/suite"
2826
)
@@ -39,17 +37,6 @@ var HTTPRouteInvalidCrossNamespaceParentRef = suite.ConformanceTest{
3937
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}
4038
routeNN := types.NamespacedName{Name: "invalid-cross-namespace-parent-ref", Namespace: "gateway-conformance-web-backend"}
4139

42-
// The Route must have an Accepted Condition with a ParentRefNotPermitted Reason.
43-
t.Run("HTTPRoute with a cross-namespace ParentRef where no ReferenceGrants allows such a reference, has an Accepted Condition with status False and Reason ParentRefNotPermitted", func(t *testing.T) {
44-
acceptedCond := metav1.Condition{
45-
Type: string(v1beta1.RouteConditionAccepted),
46-
Status: metav1.ConditionFalse,
47-
Reason: string(v1beta1.RouteReasonParentRefNotPermitted),
48-
}
49-
50-
kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, acceptedCond)
51-
})
52-
5340
t.Run("Route should not have Parents set in status", func(t *testing.T) {
5441
kubernetes.HTTPRouteMustHaveNoAcceptedParents(t, suite.Client, suite.TimeoutConfig, routeNN)
5542
})

conformance/tests/httproute-invalid-parentref-not-matching-listener-port.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ var HTTPRouteInvalidParentRefNotMatchingListenerPort = suite.ConformanceTest{
4242

4343
// The Route must have an Accepted Condition with a NoMatchingParent Reason.
4444
t.Run("HTTPRoute with no matching port in ParentRef has an Accepted Condition with status False and Reason NoMatchingParent", func(t *testing.T) {
45-
acceptedCond := metav1.Condition{
45+
resolvedRefsCond := metav1.Condition{
4646
Type: string(v1beta1.RouteConditionAccepted),
4747
Status: metav1.ConditionFalse,
4848
Reason: string(v1beta1.RouteReasonNoMatchingParent),
4949
}
5050

51-
kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, acceptedCond)
51+
kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, resolvedRefsCond)
5252
})
5353

5454
t.Run("Route should not have Parents accepted in status", func(t *testing.T) {

0 commit comments

Comments
 (0)