Skip to content

Commit 73c7fe5

Browse files
committed
chore: Merge branch 'main' into chore/release-stackablectl-24.11.1
2 parents e93cd1f + 26c850c commit 73c7fe5

File tree

4 files changed

+130
-4
lines changed

4 files changed

+130
-4
lines changed

Cargo.lock

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 101 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dotenvy = "0.15"
3030
futures = "0.3"
3131
indexmap = { version = "2.2", features = ["serde"] }
3232
k8s-openapi = { version = "0.22", default-features = false, features = ["v1_30"] }
33-
kube = { version = "0.93", default-features = false, features = ["client", "rustls-tls", "ws"] }
33+
kube = { version = "0.93", default-features = false, features = ["client", "rustls-tls", "ws", "socks5", "http-proxy"] }
3434
lazy_static = "1.5"
3535
libc = "0.2"
3636
once_cell = "1.19"

rust/stackablectl/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ All notable changes to this project will be documented in this file.
99
### Added
1010

1111
- Add shell completions for Nushell and Elvish ([#337]).
12+
- SOCKS5 and HTTP proxy support ([#328]).
1213

1314
### Fixed
1415

1516
- Sort operator versions by semver version instead of alphabetically ([#336]).
1617

18+
[#328]: https://github.com/stackabletech/stackable-cockpit/pull/328
1719
[#336]: https://github.com/stackabletech/stackable-cockpit/pull/336
1820
[#337]: https://github.com/stackabletech/stackable-cockpit/pull/337
1921

0 commit comments

Comments
 (0)