chore: Merge branch 'main' into chore/release-stackablectl-24.11.1

stackabletech · Nov 20, 2024 · 73c7fe5 · 73c7fe5
2 parents e93cd1f + 26c850c
commit 73c7fe5
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ dotenvy = "0.15"
 futures = "0.3"
 indexmap = { version = "2.2", features = ["serde"] }
 k8s-openapi = { version = "0.22", default-features = false, features = ["v1_30"] }
-kube = { version = "0.93", default-features = false, features = ["client", "rustls-tls", "ws"] }
+kube = { version = "0.93", default-features = false, features = ["client", "rustls-tls", "ws", "socks5", "http-proxy"] }
 lazy_static = "1.5"
 libc = "0.2"
 once_cell = "1.19"

diff --git a/rust/stackablectl/CHANGELOG.md b/rust/stackablectl/CHANGELOG.md
@@ -9,11 +9,13 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Add shell completions for Nushell and Elvish ([#337]).
+- SOCKS5 and HTTP proxy support ([#328]).
 
 ### Fixed
 
 - Sort operator versions by semver version instead of alphabetically ([#336]).
 
+[#328]: https://github.com/stackabletech/stackable-cockpit/pull/328
 [#336]: https://github.com/stackabletech/stackable-cockpit/pull/336
 [#337]: https://github.com/stackabletech/stackable-cockpit/pull/337