chore: change default tls to rustls

ulagbulag · Jul 30, 2024 · e55ee37 · e55ee37
1 parent 11a490c
commit e55ee37
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -80,7 +80,8 @@ RUN \
     # Disable terminal hooks
     && sed -i '/\[\[hooks\]\]/,$d' 'Trunk.toml' \
     # Build
-    && trunk build --dist '/out' --release --features 'full'
+    && trunk build --dist '/out' --release \
+    --no-default-features --features 'full'
 
 # Copy executable files
 FROM server

diff --git a/Dockerfile.server b/Dockerfile.server
@@ -23,7 +23,6 @@ CMD [ "/bin/bash" ]
 # Install dependencies
 RUN apt-get update && apt-get install -y \
     hwloc \
-    libssl3 \
     # Cleanup
     && apt-get clean all \
     && rm -rf /var/lib/apt/lists/*
@@ -56,7 +55,8 @@ RUN \
     # Create an output directory
     mkdir /out \
     # Build
-    && cargo build --release --features 'full' \
+    && cargo build --release \
+    --no-default-features --features 'full,openark,rustls-tls' \
     --package 'cassette-gateway' \
     --package 'cassette-operator' \
     && find ./target/release/ -maxdepth 1 -type f -perm -a=x -print0 | xargs -0 -I {} mv {} /out

diff --git a/crates/cassette-core/Cargo.toml b/crates/cassette-core/Cargo.toml
@@ -31,7 +31,7 @@ stream = ["dep:wasm-streams"]
 examples = []
 mock-release = []
 
-# plugins
+# Plugins
 
 ## Connected Data Lake (CDL)
 cdl = []

diff --git a/crates/cassette-gateway/Cargo.toml b/crates/cassette-gateway/Cargo.toml
@@ -26,7 +26,7 @@ experimental = []
 openark = ["vine"]
 
 # TLS
-default-tls = ["openssl-tls"]
+default-tls = ["rustls-tls"]
 openssl-tls = [
     "actix-web/openssl",
     "cassette-plugin-cdl-api/openssl-tls",
@@ -46,7 +46,7 @@ vine = [
     "cassette-plugin-kubernetes-api?/vine",
 ]
 
-# plugins
+# Plugins
 
 ## Connected Data Lake (CDL)
 cdl = ["cassette-core/cdl", "dep:cassette-plugin-cdl-api"]

diff --git a/crates/cassette-operator/Cargo.toml b/crates/cassette-operator/Cargo.toml
@@ -23,7 +23,7 @@ workspace = true
 default = ["default-tls"]
 
 # TLS
-default-tls = ["openssl-tls"]
+default-tls = ["rustls-tls"]
 openssl-tls = ["kube/openssl-tls"]
 rustls-tls = ["kube/rustls-tls"]
 

diff --git a/crates/cassette-plugin-cdl-api/Cargo.toml b/crates/cassette-plugin-cdl-api/Cargo.toml
@@ -24,7 +24,7 @@ default = []
 vine = ["cassette-plugin-kubernetes-api/vine"]
 
 # TLS
-default-tls = ["openssl-tls"]
+default-tls = ["rustls-tls"]
 openssl-tls = ["dash-pipe-provider/openssl-tls", "kube/openssl-tls"]
 rustls-tls = ["dash-pipe-provider/rustls-tls", "kube/rustls-tls"]
 

diff --git a/crates/cassette/Cargo.toml b/crates/cassette/Cargo.toml
@@ -29,7 +29,7 @@ experimental = []
 examples = ["cassette-core/examples", "dep:cassette-loader-file"]
 mock-release = ["cassette-core/mock-release"]
 
-# plugins
+# Plugins
 
 ## Connected Data Lake (CDL)
 cdl = [