deps: Update to kube v0.87 and k8s-openapi v0.20 (linkerd#80)

* deps: Update to kube v0.87 and k8s-openapi v0.20 This update features changes to the kube::CustomResource interface. * Test k8s 1.22 and 1.28 Signed-off-by: Mark S <[email protected]>
the-wondersmith · Apr 23, 2024 · 838a5cd · 838a5cd
1 parent 7e6a562
commit 838a5cd
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -25,10 +25,8 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.21
-          - v1.25
-          - v1.26
-          - v1.27
+          - v1.22
+          - v1.28
     timeout-minutes: 10
     runs-on: ubuntu-latest
     env:

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,18 +16,18 @@ default = []
 experimental = []
 
 [dependencies]
-kube = { version = "0.85", default-features = false, features = ["derive"] }
-k8s-openapi = { version = "0.19", features = ["schemars"] }
+kube = { version = "0.87", default-features = false, features = ["derive"] }
+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.19"
+version = "0.20"
 default-features = false
-features = ["v1_27"]
+features = ["latest"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
-features = ["experimental", "k8s-openapi/v1_27"]
+features = ["experimental", "k8s-openapi/latest"]
diff --git a/integration/Cargo.toml b/integration/Cargo.toml
@@ -6,12 +6,12 @@ license = "Apache-2.0"
 publish = false
 
 [dev-dependencies]
-k8s-openapi = { version = "0.19", features = ["v1_27"] }
+k8s-openapi = { version = "0.20", features = ["latest"] }
 tokio = { version = "1", features = ["macros", "rt"] }
 tracing = "0.1"
 k8s-gateway-api = { path = ".." }
 
 [dev-dependencies.kube]
-version = "0.85"
+version = "0.87"
 default-features = false
 features = ["client", "openssl-tls", "runtime", "ws"]
diff --git a/src/exp/tcproute.rs b/src/exp/tcproute.rs
@@ -10,7 +10,7 @@ use crate::*;
     group = "gateway.networking.k8s.io",
     version = "v1alpha2",
     kind = "TCPRoute",
-    struct = "TcpRoute",
+    root = "TcpRoute",
     status = "TcpRouteStatus",
     namespaced
 )]

diff --git a/src/exp/tlsroute.rs b/src/exp/tlsroute.rs
@@ -13,7 +13,7 @@ use crate::*;
     group = "gateway.networking.k8s.io",
     version = "v1alpha2",
     kind = "TLSRoute",
-    struct = "TlsRoute",
+    root = "TlsRoute",
     status = "TlsRouteStatus",
     namespaced
 )]

diff --git a/src/exp/udproute.rs b/src/exp/udproute.rs
@@ -7,7 +7,7 @@ use crate::*;
     group = "gateway.networking.k8s.io",
     version = "v1alpha2",
     kind = "UDPRoute",
-    struct = "UdpRoute",
+    root = "UdpRoute",
     status = "UdpRouteStatus",
     namespaced
 )]

diff --git a/src/httproute.rs b/src/httproute.rs
@@ -17,7 +17,7 @@ use crate::*;
     group = "gateway.networking.k8s.io",
     version = "v1",
     kind = "HTTPRoute",
-    struct = "HttpRoute",
+    root = "HttpRoute",
     status = "HttpRouteStatus",
     namespaced
 )]