Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore(policy): Remove OpenSSL from the policy controller #14292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfleen merged 1 commit into from
Aug 5, 2025
+9 −87
Merged

chore(policy): Remove OpenSSL from the policy controller #14292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 2 additions & 63 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,25 +1012,6 @@ dependencies = [
"tower-service",
]

[[package]]
name = "hyper-openssl"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "527d4d619ca2c2aafa31ec139a3d1d60bf557bf7578a1f20f743637eccd9ca19"
dependencies = [
"http",
"hyper",
"hyper-util",
"linked_hash_set",
"once_cell",
"openssl",
"openssl-sys",
"parking_lot",
"pin-project",
"tower-layer",
"tower-service",
]

[[package]]
name = "hyper-rustls"
version = "0.27.7"
Expand Down Expand Up @@ -1294,14 +1275,12 @@ dependencies = [
"http-body-util",
"hyper",
"hyper-http-proxy",
"hyper-openssl",
"hyper-rustls",
"hyper-timeout",
"hyper-util",
"jsonpath-rust",
"k8s-openapi",
"kube-core",
"openssl",
"pem",
"rustls",
"secrecy",
Expand Down Expand Up @@ -1393,16 +1372,13 @@ dependencies = [
"futures-util",
"http-body-util",
"hyper",
"hyper-openssl",
"hyper-util",
"k8s-openapi",
"kube-client",
"kube-core",
"kube-runtime",
"kubert-prometheus-process",
"kubert-prometheus-tokio",
"once_cell",
"openssl",
"parking_lot",
"pin-project-lite",
"prometheus-client",
Expand All @@ -1411,7 +1387,6 @@ dependencies = [
"serde_json",
"thiserror 2.0.12",
"tokio",
"tokio-openssl",
"tokio-rustls",
"tower 0.5.2",
"tower-http",
Expand Down Expand Up @@ -1471,21 +1446,6 @@ dependencies = [
"windows-targets",
]

[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

[[package]]
name = "linked_hash_set"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bae85b5be22d9843c80e5fc80e9b64c8a3b1f98f867c709956eca3efff4e92e2"
dependencies = [
"linked-hash-map",
]

[[package]]
name = "linkerd-policy-controller"
version = "0.1.0"
Expand Down Expand Up @@ -1832,15 +1792,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"

[[package]]
name = "openssl-src"
version = "300.5.1+3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "735230c832b28c000e3bc117119e6466a663ec73506bc0a9907ea4187508e42a"
dependencies = [
"cc",
]

[[package]]
name = "openssl-sys"
version = "0.9.109"
Expand All @@ -1849,7 +1800,6 @@ checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
dependencies = [
"cc",
"libc",
"openssl-src",
"pkg-config",
"vcpkg",
]
Expand Down Expand Up @@ -2007,9 +1957,9 @@ dependencies = [

[[package]]
name = "prettyplease"
version = "0.2.35"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a"
checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
dependencies = [
"proc-macro2",
"syn",
Expand Down Expand Up @@ -2700,17 +2650,6 @@ dependencies = [
"tokio-stream",
]

[[package]]
name = "tokio-openssl"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd"
dependencies = [
"openssl",
"openssl-sys",
"tokio",
]

[[package]]
name = "tokio-rustls"
version = "0.26.2"
Expand Down
10 changes: 1 addition & 9 deletions policy-controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,13 @@ edition = "2021"
license = "Apache-2.0"
publish = false

[features]
default = ["rustls-tls"]
openssl-tls = ["linkerd-policy-controller-runtime/openssl-tls"]
# Vendor openssl to statically link lib
openssl-vendored = ["linkerd-policy-controller-runtime/openssl-vendored"]
rustls-tls = ["linkerd-policy-controller-runtime/rustls-tls", "dep:rustls", "rustls/aws-lc-rs"]

[dependencies]
anyhow = "1"
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
rustls = { version = "0.23.29", default-features = false, optional = true }
rustls = { version = "0.23.29", default-features = false, features = ["aws-lc-rs"] }

[dependencies.linkerd-policy-controller-runtime]
workspace = true
default-features = false

[target.x86_64-unknown-linux-gnu.dependencies]
jemallocator = "0.5"
10 changes: 2 additions & 8 deletions policy-controller/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ edition = "2021"
license = "Apache-2.0"
publish = false

[features]
default = ["rustls-tls"]
openssl-tls = ["kube/openssl-tls", "kubert/openssl-tls"]
# Vendor openssl to statically link lib
openssl-vendored = ["openssl-tls", "openssl/vendored"]
rustls-tls = ["kube/rustls-tls", "kubert/rustls-tls"]

[dependencies]
anyhow = "1"
async-trait = "0.1"
Expand Down Expand Up @@ -49,7 +42,7 @@ features = ["derive", "env", "std"]
[dependencies.kube]
workspace = true
default-features = false
features = ["admission", "derive"]
features = ["admission", "derive", "rustls-tls"]

[dependencies.kubert]
workspace = true
Expand All @@ -61,6 +54,7 @@ features = [
"prometheus-client",
"runtime",
"server",
"rustls-tls"
]

[dependencies.tokio]
Expand Down
11 changes: 4 additions & 7 deletions policy-controller/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;

#[tokio::main]
async fn main() -> anyhow::Result<()> {
#[cfg(feature = "rustls-tls")]
if rustls::crypto::aws_lc_rs::default_provider()
.install_default()
.is_err()
{
if rustls::crypto::aws_lc_rs::default_provider()
.install_default()
.is_err()
{
anyhow::bail!("No other crypto provider should be installed yet");
}
anyhow::bail!("No other crypto provider should be installed yet");
}

linkerd_policy_controller_runtime::Args::parse_and_run().await
Expand Down