Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions conformance/tests/gateway-invalid-route-kind.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var GatewayInvalidRouteKind = suite.ConformanceTest{
Status: metav1.ConditionFalse,
Reason: string(v1beta1.ListenerReasonInvalidRouteKinds),
}},
AttachedRoutes: 0,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
Expand All @@ -64,6 +65,7 @@ var GatewayInvalidRouteKind = suite.ConformanceTest{
Status: metav1.ConditionFalse,
Reason: string(v1beta1.ListenerReasonInvalidRouteKinds),
}},
AttachedRoutes: 0,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
Expand Down
1 change: 1 addition & 0 deletions conformance/tests/gateway-invalid-tls-certificateref.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var GatewayInvalidTLSConfiguration = suite.ConformanceTest{
Status: metav1.ConditionFalse,
Reason: string(v1beta1.ListenerReasonInvalidCertificateRef),
}},
AttachedRoutes: 0,
}}

testCases := []struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ var GatewaySecretInvalidReferenceGrant = suite.ConformanceTest{
Status: metav1.ConditionFalse,
Reason: string(v1beta1.ListenerReasonRefNotPermitted),
}},
AttachedRoutes: 0,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ var GatewaySecretMissingReferenceGrant = suite.ConformanceTest{
Status: metav1.ConditionFalse,
Reason: string(v1beta1.ListenerReasonRefNotPermitted),
}},
AttachedRoutes: 0,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ var GatewaySecretReferenceGrantAllInNamespace = suite.ConformanceTest{
Reason: string(v1beta1.ListenerConditionProgrammed),
},
},
AttachedRoutes: 0,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ var GatewaySecretReferenceGrantSpecific = suite.ConformanceTest{
Reason: string(v1beta1.ListenerReasonProgrammed),
},
},
AttachedRoutes: 0,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
Expand Down
77 changes: 77 additions & 0 deletions conformance/tests/gateway-with-attached-routes.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
Copyright 2022 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package tests

import (
"testing"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"sigs.k8s.io/gateway-api/apis/v1beta1"
"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
"sigs.k8s.io/gateway-api/conformance/utils/suite"
)

func init() {
ConformanceTests = append(ConformanceTests, GatewayWithAttachedRoutes)
}

var GatewayWithAttachedRoutes = suite.ConformanceTest{
ShortName: "GatewayWithAttachedRoutes",
Description: "A Gateway in the gateway-conformance-infra namespace should be attached to routes.",
Manifests: []string{"tests/gateway-with-attached-routes.yaml"},
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
t.Run("Gateway listener should have one valid http routes attached", func(t *testing.T) {
gwNN := types.NamespacedName{Name: "gateway-with-one-attached-route", Namespace: "gateway-conformance-infra"}
listeners := []v1beta1.ListenerStatus{{
Name: v1beta1.SectionName("http"),
SupportedKinds: []v1beta1.RouteGroupKind{{
Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
Kind: v1beta1.Kind("HTTPRoute"),
}},
Conditions: []metav1.Condition{{
Type: string(v1beta1.RouteConditionAccepted),
Status: metav1.ConditionTrue,
Reason: "", //any reason
}},
AttachedRoutes: 1,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
})

t.Run("Gateway listener should have two valid http routes attached", func(t *testing.T) {
gwNN := types.NamespacedName{Name: "gateway-with-two-attached-routes", Namespace: "gateway-conformance-infra"}
listeners := []v1beta1.ListenerStatus{{
Name: v1beta1.SectionName("http"),
SupportedKinds: []v1beta1.RouteGroupKind{{
Group: (*v1beta1.Group)(&v1beta1.GroupVersion.Group),
Kind: v1beta1.Kind("HTTPRoute"),
}},
Conditions: []metav1.Condition{{
Type: string(v1beta1.RouteConditionAccepted),
Status: metav1.ConditionTrue,
Reason: "", //any reason
}},
AttachedRoutes: 2,
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
})
},
}
88 changes: 88 additions & 0 deletions conformance/tests/gateway-with-attached-routes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: gateway-with-one-attached-route
namespace: gateway-conformance-infra
spec:
gatewayClassName: "{GATEWAY_CLASS_NAME}"
listeners:
- name: http
port: 80
protocol: HTTP
allowedRoutes:
kinds:
- kind: HTTPRoute
namespaces:
from: Selector
selector:
matchLabels:
# This label is added automatically as of K8s 1.22
# to all namespaces
kubernetes.io/metadata.name: gateway-conformance-infra
---
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-route-1
namespace: gateway-conformance-infra
spec:
parentRefs:
- kind: Gateway
name: gateway-with-one-attached-route
namespace: gateway-conformance-infra
rules:
- backendRefs:
- name: foo-svc
port: 8080
---
apiVersion: gateway.networking.k8s.io/v1beta1
kind: Gateway
metadata:
name: gateway-with-two-attached-routes
namespace: gateway-conformance-infra
spec:
gatewayClassName: "{GATEWAY_CLASS_NAME}"
listeners:
- name: http
port: 80
protocol: HTTP
allowedRoutes:
kinds:
- kind: HTTPRoute
namespaces:
from: Selector
selector:
matchLabels:
# This label is added automatically as of K8s 1.22
# to all namespaces
kubernetes.io/metadata.name: gateway-conformance-infra
---
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-route-2
namespace: gateway-conformance-infra
spec:
parentRefs:
- kind: Gateway
name: gateway-with-two-attached-routes
namespace: gateway-conformance-infra
rules:
- backendRefs:
- name: foo-svc
port: 8080
---
apiVersion: gateway.networking.k8s.io/v1beta1
kind: HTTPRoute
metadata:
name: http-route-3
namespace: gateway-conformance-infra
spec:
parentRefs:
- kind: Gateway
name: gateway-with-two-attached-routes
namespace: gateway-conformance-infra
rules:
- backendRefs:
- name: foo-svc
port: 8080