Skip to content

Commit 41f9832

Browse files
authored
fix(stackable-webhook): Avoid aws-lc-rs crate, as it fails in nix (#1043)
* fix(stackable-webhook): Avoid aws-lc-rs crate, as it block "make run-dev" * changelog * changelog
1 parent ff3d6a2 commit 41f9832

File tree

5 files changed

+16
-187
lines changed

5 files changed

+16
-187
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/operator-rs"
1111
[workspace.dependencies]
1212
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
1313

14-
axum = "0.8.1"
14+
axum = { version = "0.8.1", features = ["http2"] }
1515
chrono = { version = "0.4.38", default-features = false }
1616
clap = { version = "4.5.17", features = ["derive", "cargo", "env"] }
1717
const_format = "0.2.33"
@@ -33,6 +33,7 @@ itertools = "0.14.0"
3333
json-patch = "4.0.0"
3434
k8s-openapi = { version = "0.25.0", default-features = false, features = ["schemars", "v1_33"] }
3535
# We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
36+
# We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
3637
kube = { version = "1.0.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls", "ring"] }
3738
opentelemetry = "0.29.1"
3839
opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio"] }
@@ -64,7 +65,8 @@ syn = "2.0.77"
6465
tempfile = "3.12.0"
6566
time = { version = "0.3.36" }
6667
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread", "fs"] }
67-
tokio-rustls = "0.26.0"
68+
# We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
69+
tokio-rustls = { version = "0.26.0", default-features = false, features = ["ring", "logging", "tls12"] }
6870
tokio-test = "0.4.4"
6971
tower = { version = "0.5.1", features = ["util"] }
7072
tower-http = { version = "0.6.1", features = ["trace"] }

crates/stackable-webhook/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Fixed
8+
9+
- Don't pull in the `aws-lc-rs` crate, as this currently fails to build in `make run-dev` ([#1043]).
10+
11+
[#1043]: https://github.com/stackabletech/operator-rs/pull/1043
12+
713
## [0.3.1] - 2024-07-10
814

915
## Changed

crates/stackable-webhook/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ stackable-certs = { path = "../stackable-certs", features = ["rustls"] }
1111
stackable-telemetry = { path = "../stackable-telemetry" }
1212
stackable-operator = { path = "../stackable-operator" }
1313

14-
axum = { workspace = true, features = ["http2"] }
14+
axum.workspace = true
1515
futures-util.workspace = true
1616
hyper-util.workspace = true
1717
hyper.workspace = true

0 commit comments

Comments
 (0)