Skip to content

Commit e8767f1

Browse files
smagnani96julianwiedmann
authored andcommitted
gateway-api: Fix TLSRoute versions in yaml test data
Integration tests are consistently failing with: ```bash --- FAIL: Test_Conformance/tlsroute-mixed-protocol-listeners (0.01s) gateway_reconcile_test.go:396: Error Trace: operator/pkg/gateway-api/gateway_reconcile_test.go:396 Error: Should be empty, but was   &v1.TLSRoute{    TypeMeta: v1.TypeMeta{    Kind: "TLSRoute", -  APIVersion: "gateway.networking.k8s.io/v1alpha2", +  APIVersion: "gateway.networking.k8s.io/v1",    },    ObjectMeta: {Name: "tlsroute-mixed", Namespace: "gateway-conformance-infra"},    Spec: {CommonRouteSpec: {ParentRefs: {{Name: "gateway-tlsroute-mixed"}}}, Hostnames: {"tls.example.com"}, Rules: {{BackendRefs: {{BackendObjectReference: {Name: "tls-backend", Port: &443}}}}}},    Status: {RouteStatus: {Parents: {{ParentRef: {Name: "gateway-tlsroute-mixed"}, ControllerName: "io.cilium/gateway-controller", Conditions: {{Type: "Accepted", Status: "True", Reason: "Accepted", Message: "Accepted TLSRoute", ...}, {Type: "ResolvedRefs", Status: "True", Reason: "ResolvedRefs", Message: "Service reference is valid", ...}}}}}},   } Test: Test_Conformance/tlsroute-mixed-protocol-listeners FAIL FAIL github.com/cilium/cilium/operator/pkg/gateway-api 2.216s ``` Actually changing only `tlsroute-tlsroute-mixed.yaml` would've worked, but from the original deprecation commit (see below) I think adjusting versioning also in other yamls makes sense. Fixes: cilium@e4f9675. Signed-off-by: Simone Magnani <simone.magnani@isovalent.com>
1 parent 6b0a55e commit e8767f1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • operator/pkg/model/ingestion/testdata/gateway/Conformance/TLSRouteHostnameIntersection

operator/pkg/model/ingestion/testdata/gateway/Conformance/TLSRouteHostnameIntersection/input-tlsroute.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- apiVersion: gateway.networking.k8s.io/v1alpha2
1+
- apiVersion: gateway.networking.k8s.io/v1
22
kind: TLSRoute
33
metadata:
44
name: tlsroute-exact-hostname-x-4
@@ -30,7 +30,7 @@
3030
parentRef:
3131
name: gw-tlsroute-empty-hostname-x-4
3232
namespace: gateway-conformance-infra
33-
- apiVersion: gateway.networking.k8s.io/v1alpha2
33+
- apiVersion: gateway.networking.k8s.io/v1
3434
kind: TLSRoute
3535
metadata:
3636
name: tlsroute-less-specific-wc-hostname-x-4

0 commit comments

Comments
 (0)