From a79e21512cec72ec5a8a4e3b6f03b5ad58d4a3a2 Mon Sep 17 00:00:00 2001 From: Ho Kim Date: Thu, 11 Jul 2024 21:59:21 +0000 Subject: [PATCH] fix: fill missing openssl support --- Cargo.toml | 1 - crates/dash/pipe/provider/Cargo.toml | 8 +++++--- crates/kiss/dns/Cargo.toml | 2 ++ crates/kubegraph/market/gateway/Cargo.toml | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 41dfe7c5..47c6574c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -146,7 +146,6 @@ gethostname = { version = "0.4" } glob = { version = "0.3" } hickory-server = { version = "*", default-features = false, features = [ "backtrace", - "dnssec-ring", ] } home = { version = "0.5" } http-cache-reqwest = { version = "0.14", features = ["manager-cacache"] } diff --git a/crates/dash/pipe/provider/Cargo.toml b/crates/dash/pipe/provider/Cargo.toml index 02e79974..3a7fb5dd 100644 --- a/crates/dash/pipe/provider/Cargo.toml +++ b/crates/dash/pipe/provider/Cargo.toml @@ -30,7 +30,7 @@ messengers = [ # "ros2", # exclude(alpine) ] kafka = ["dep:rdkafka"] -nats = ["dep:async-nats"] +nats = ["ark-core-k8s/async-nats", "dep:async-nats"] ros2 = ["dep:r2r"] # storage @@ -43,7 +43,10 @@ s3 = ["chrono", "minio"] arrow = ["dep:arrow", "async-stream"] # TLS -openssl-tls = ["deltalake?/s3-native-tls", "minio?/native-tls"] +openssl-tls = [ + "deltalake?/s3-native-tls", # FIXME: it depends on `ring`! + "minio?/native-tls", +] rustls-tls = ["async-nats?/ring", "deltalake?/s3", "minio?/rustls-tls"] [dependencies] @@ -51,7 +54,6 @@ ark-core = { path = "../../../ark/core", default-features = false, features = [ "signal", ] } ark-core-k8s = { path = "../../../ark/core/k8s", default-features = false, features = [ - "async-nats", "data", ] } dash-api = { path = "../../api", optional = true } diff --git a/crates/kiss/dns/Cargo.toml b/crates/kiss/dns/Cargo.toml index 81dbf6af..671ed9ef 100644 --- a/crates/kiss/dns/Cargo.toml +++ b/crates/kiss/dns/Cargo.toml @@ -27,11 +27,13 @@ default-tls = ["rustls-tls"] openssl-tls = [ "ark-core-k8s/openssl-tls", "hickory-server/dns-over-openssl", + "hickory-server/dnssec-openssl", "kube/openssl-tls", ] rustls-tls = [ "ark-core-k8s/rustls-tls", "hickory-server/dns-over-https-rustls", + "hickory-server/dnssec-ring", "kube/rustls-tls", ] diff --git a/crates/kubegraph/market/gateway/Cargo.toml b/crates/kubegraph/market/gateway/Cargo.toml index a9a62d9b..88f7d9c7 100644 --- a/crates/kubegraph/market/gateway/Cargo.toml +++ b/crates/kubegraph/market/gateway/Cargo.toml @@ -83,9 +83,9 @@ default-tls = ["rustls-tls"] openssl-tls = [ "actix-web/openssl", "kubegraph-api/openssl-tls", - "kubegraph-market-entity/rustls-tls", - "kubegraph-market-function/rustls-tls", - "kubegraph-market-migration/rustls-tls", + "kubegraph-market-entity/openssl-tls", + "kubegraph-market-function/openssl-tls", + "kubegraph-market-migration/openssl-tls", "kubegraph-vm-local?/openssl-tls", "sea-orm/runtime-tokio-native-tls", ]