Change reqwest to use rustls with native certificates to work in more…

… cases (#2373)
metalbear-co · Apr 16, 2024 · 556dc24 · 556dc24
1 parent 38adfc9
commit 556dc24
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,7 +53,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 futures = "0.3"
 thiserror = "1"
 k8s-openapi = { version = "0.20", features = ["v1_24"] }
-reqwest = { version = "0.11", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+reqwest = { version = "0.11", default-features = false, features = ["blocking", "rustls-tls-native-roots", "json", "socks"] }
 kube = { git = "https://github.com/metalbear-co/kube", default-features = false, features = ["runtime", "derive", "client", "ws", "rustls-tls", "oidc", "socks5", "http_proxy"] }
 trust-dns-resolver = { version = "0.22", features = ["serde-config", "tokio-runtime"] }
 tokio-util = { version = "0.7", features = ["net", "codec"] }

diff --git a/changelog.d/+reqwest-trust-ca.fixed.md b/changelog.d/+reqwest-trust-ca.fixed.md
@@ -0,0 +1 @@
+Change reqwest to use rustls with native certificates to work in more cases
diff --git a/mirrord/auth/Cargo.toml b/mirrord/auth/Cargo.toml
@@ -41,5 +41,5 @@ tokio = { workspace = true, features = ["fs"], optional = true  }
 thiserror = "1"
 x509-certificate = "0.19"
 # not direct dependency, but if we don't put it here it'll use openssl :(
-reqwest = { workspace = true, features=["json", "rustls-tls"], default-features = false, optional = true }
+reqwest = { workspace = true, features=["json", "rustls-tls-native-roots"], default-features = false, optional = true }
 tracing.workspace = true
diff --git a/mirrord/operator/Cargo.toml b/mirrord/operator/Cargo.toml
@@ -60,7 +60,7 @@ k8s-openapi = { workspace = true, optional = true }
 kube = { workspace = true, features = ["derive", "ws"], optional = true }
 futures = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }
-reqwest = { workspace = true, default-features = false, features = ["blocking", "json", "rustls-tls"], optional = true }
+reqwest = { workspace = true, default-features = false, features = ["blocking", "json", "rustls-tls-native-roots"], optional = true }
 schemars = { version = "0.8", features = ["chrono"] }
 serde.workspace = true
 serde_json = { workspace = true, optional = true }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Change reqwest to use rustls with native certificates to work in more cases