From 70140ad25e4cdb31391f330c2ca74e86e94d45b1 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Fri, 11 Aug 2023 12:11:56 +0200 Subject: [PATCH 1/3] Switch openssl to rustls We can do so, because https://github.com/rustls/rustls/issues/184 was resolved --- Cargo.toml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0722a7111..12c53d888 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,12 +18,16 @@ repository.workspace = true chrono = { version = "0.4.26", default-features = false } clap = { version = "4.3.19", features = ["derive", "cargo", "env"] } const_format = "0.2.31" +derivative = "2.2.0" either = "1.9.0" futures = "0.3.28" json-patch = "1.0.0" k8s-openapi = { version = "0.19.0", default-features = false, features = ["schemars", "v1_27"] } -kube = { version = "0.85.0", features = ["jsonpatch", "runtime", "derive"] } +# We use rustls instead of openssl for easier portablitly, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl +kube = { version = "0.85.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls"] } lazy_static = "1.4.0" +opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } +opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio"] } product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.4.0" } rand = "0.8.5" regex = "1.9.3" @@ -31,17 +35,14 @@ schemars = "0.8.12" serde = { version = "=1.0.171", features = ["derive"] } # We need to pin 1.0.171 as of now, as otherwise Nix builds break because of https://github.com/serde-rs/serde/issues/2538 serde_json = "1.0.104" serde_yaml = "0.9.25" +snafu = "0.7.5" +stackable-operator-derive = { path = "stackable-operator-derive" } strum = { version = "0.25.0", features = ["derive"] } thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] } tracing = "0.1.37" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -derivative = "2.2.0" tracing-opentelemetry = "0.20.0" -opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } -opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio"] } -stackable-operator-derive = { path = "stackable-operator-derive" } -snafu = "0.7.5" +tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } [dev-dependencies] rstest = "0.18.1" From 275c202cfec4ba814128bac27ae82f50ef800ce3 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Fri, 11 Aug 2023 12:25:47 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f544dcd8..e472ec837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,12 @@ All notable changes to this project will be documented in this file. - Implement `Sum` for `CpuQuantity` and `MemoryQuantity` ([#634]). +### Changed + +- Switch from `openssl` to `rustls` ([#634]). + [#634]: https://github.com/stackabletech/operator-rs/pull/634 +[#635]: https://github.com/stackabletech/operator-rs/pull/635 ## [0.46.0] - 2023-08-08 From dea171a5de15732750739955f3bbf937cc2f7005 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Fri, 11 Aug 2023 12:31:16 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e472ec837..a00265b5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Switch from `openssl` to `rustls` ([#634]). +- Switch from `openssl` to `rustls` ([#635]). [#634]: https://github.com/stackabletech/operator-rs/pull/634 [#635]: https://github.com/stackabletech/operator-rs/pull/635