Update gateway types to v1 (linkerd#79)

Update gateway API type to v1 as defined at https://github.com/kubernetes-sigs/gateway-api/tree/main/apis/v1 Signed-off-by: Alex Leong <[email protected]> Signed-off-by: Mark S <[email protected]>
the-wondersmith · Apr 27, 2024 · ea8c044 · ea8c044
1 parent a3f52d6
commit ea8c044
Show file tree

Hide file tree

Showing 11 changed files with 1,013 additions and 227 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           repository: kubernetes-sigs/gateway-api
-          ref: 4f86f0bd65173b04dadb558f63fbbd53330736d2 # 0.5.0-rc1
+          ref: a0684982eddeb0360e215e0de322c3210ac49bb9 # v1.0.0
           path: gateway-api
       - run: kubectl apply -k gateway-api/config/crd/experimental/
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   lint:
-    timeout-minutes: 5
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     container: docker://ghcr.io/linkerd/dev:v39-rust
     steps:

diff --git a/Cargo.toml b/Cargo.toml
@@ -21,6 +21,7 @@ k8s-openapi = { version = "0.19", features = ["schemars"] }
 schemars = { version = "0.8", features = ["derive"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+thiserror = "1"
 
 [dev-dependencies.k8s-openapi]
 version = "0.19"

diff --git a/integration/tests/gateway.rs b/integration/tests/gateway.rs
@@ -19,6 +19,7 @@ async fn round_trip() {
         },
         spec: GatewaySpec {
             gateway_class_name: "acme-lb".to_string(),
+            infrastructure: None,
             listeners: vec![Listener {
                 protocol: "HTTPS".to_string(),
                 port: 443,

diff --git a/integration/tests/httproute.rs b/integration/tests/httproute.rs
@@ -41,6 +41,7 @@ async fn round_trip() {
                     ]),
                     filters: None,
                     matches: None,
+                    timeouts: None,
                 },
                 HttpRouteRule {
                     matches: Some(vec![HttpRouteMatch {
@@ -58,6 +59,7 @@ async fn round_trip() {
                         filters: None,
                     }]),
                     filters: None,
+                    timeouts: None,
                 },
             ]),
             ..HttpRouteSpec::default()