Revert "Update gateway types to v1 (#79)"

This reverts commit ec91fde.
linkerd · Jan 3, 2024 · 1d7eea2 · 1d7eea2
1 parent 75a76f6
commit 1d7eea2
Show file tree

Hide file tree

Showing 11 changed files with 227 additions and 1,013 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           repository: kubernetes-sigs/gateway-api
-          ref: a0684982eddeb0360e215e0de322c3210ac49bb9 # v1.0.0
+          ref: 4f86f0bd65173b04dadb558f63fbbd53330736d2 # 0.5.0-rc1
           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: 20
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:

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

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