Skip to content

Commit 3a1ad55

Browse files
authored
fix: test client with api version instead list namespace (#312)
1 parent 795d726 commit 3a1ad55

File tree

5 files changed

+59
-41
lines changed

5 files changed

+59
-41
lines changed

Cargo.lock

+33-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/kftray-portforward/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ dashmap = "6.0.0"
1818
flate2 = "1.0"
1919
futures = "0.3.30"
2020
httparse = "1.9.4"
21-
k8s-openapi = { version = "0.22.0", default-features = false, features = ["latest"] }
22-
kube = { version = "0.94.2", features = ["client", "config", "rustls-tls", "ws", "openssl-tls"] }
23-
kube-runtime = "0.94.2"
21+
k8s-openapi = { version = "0.23.0", default-features = false, features = ["latest"] }
22+
kube = { version = "0.95", features = ["client", "config", "rustls-tls", "ws", "openssl-tls"] }
23+
kube-runtime = "0.95"
2424
lazy_static = "1.5.0"
2525
log = "0.4"
2626
rand = "0.8.5"

crates/kftray-portforward/src/client.rs

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::collections::HashMap;
22
use std::env;
3+
use std::error::Error;
34
use std::future::Future;
45
use std::path::PathBuf;
56
use std::pin::Pin;
@@ -369,18 +370,21 @@ async fn create_insecure_http_client<'a>(
369370
Ok(client)
370371
}
371372

372-
async fn test_client(client: &Client) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
373-
let api: Api<Namespace> = Api::all(client.clone());
374-
api.list(&ListParams::default())
375-
.await
376-
.map(|_| ())
377-
.map_err(|e| {
378-
let err_msg = format!("Failed to list namespaces: {}", e);
379-
Box::new(std::io::Error::new(std::io::ErrorKind::Other, err_msg))
380-
as Box<dyn std::error::Error + Send + Sync>
381-
})
373+
async fn test_client(client: &Client) -> Result<(), Box<dyn Error + Send + Sync>> {
374+
match client.apiserver_version().await {
375+
Ok(version) => {
376+
info!("Kubernetes API server version: {:?}", version);
377+
Ok(())
378+
}
379+
Err(e) => {
380+
let err_msg = format!("Failed to get API server version: {}", e);
381+
Err(
382+
Box::new(std::io::Error::new(std::io::ErrorKind::Other, err_msg))
383+
as Box<dyn Error + Send + Sync>,
384+
)
385+
}
386+
}
382387
}
383-
384388
fn is_pkcs8_key(key_data: &[u8]) -> bool {
385389
key_data.starts_with(b"-----BEGIN PRIVATE KEY-----")
386390
}

crates/kftray-tauri/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ log = "0.4"
3737
env_logger = "0.11.5"
3838
openssl = { version = "0.10.66", features = ["vendored"] }
3939
openssl-sys = { version = "0.9.103", features = ["vendored"] }
40-
kube = { version = "0.94.2", features = ["client", "config", "rustls-tls", "ws", "openssl-tls"] }
41-
k8s-openapi = { version = "0.22.0", default-features = false, features = [
40+
kube = { version = "0.95.0", features = ["client", "config", "rustls-tls", "ws", "openssl-tls"] }
41+
k8s-openapi = { version = "0.23", default-features = false, features = [
4242
"latest",
4343
] }
4444
tokio-stream = { version = "0.1.15", features = ["net"] }
@@ -50,7 +50,7 @@ hyper-util = { version = "0.1.7", features = ["client-legacy", "http1", "tokio"]
5050
lazy_static = "1.5.0"
5151
serde = { version = "1.0", features = ["derive"] }
5252
rand = "0.8.5"
53-
kube-runtime = "0.94.2"
53+
kube-runtime = "0.95"
5454
tower = "0.5.0"
5555
whoami = "1.5.1"
5656
tempfile = "3.9"

crates/kftui/Cargo.toml

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ dirs = "5.0.1"
2929
base64 = "0.22.1"
3030
hostsfile = { git = "https://github.com/tonarino/innernet", branch = "main" }
3131
log = "0.4"
32-
kube = { version = "0.94.2", features = [
32+
kube = { version = "0.95.0", features = [
3333
"client",
3434
"config",
3535
"rustls-tls",
3636
"ws",
37+
"openssl-tls",
3738
] }
38-
k8s-openapi = { version = "0.22.0", default-features = false, features = [
39+
k8s-openapi = { version = "0.23", default-features = false, features = [
3940
"latest",
4041
] }
4142
tokio-stream = { version = "0.1.15", features = ["net"] }
@@ -47,7 +48,7 @@ hyper-util = { version = "0.1.7", features = ["client-legacy", "http1", "tokio"]
4748
lazy_static = "1.5.0"
4849
serde = { version = "1.0", features = ["derive"] }
4950
rand = "0.8.5"
50-
kube-runtime = "0.94.2"
51+
kube-runtime = "0.95"
5152
tower = "0.5.0"
5253
whoami = "1.5.1"
5354
tempfile = "3.9"
@@ -65,4 +66,4 @@ built = "0.7.4"
6566

6667

6768
[build-dependencies]
68-
built = "0.7"
69+
built = "0.7"

0 commit comments

Comments
 (0)