Split repo into workspace (#95)

We convert this project into a Rust workspace and move the failover controller into a member. This is to prepare for adding the CLI as a separate member from the controller. Co-authored-by: Eliza Weisman <[email protected]>
linkerd · Mar 9, 2022 · 65d9ce4 · 65d9ce4
1 parent 3966837
commit 65d9ce4
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 62 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -701,7 +701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
-name = "linkerd-failover"
+name = "linkerd-failover-controller"
 version = "0.1.0"
 dependencies = [
  "anyhow",
@@ -1094,9 +1094,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "regex-syntax",
 ]

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,44 +1,4 @@
-[package]
-name = "linkerd-failover"
-version = "0.1.0"
-authors = ["Linkerd authors <[email protected]>"]
-edition = "2018"
-license = "Apache-2.0"
-
-[dependencies]
-anyhow = "1"
-clap = { version = "3", default-features = false, features = ["derive", "env", "std"] }
-futures = "0.3"
-k8s-openapi = { version = "0.14", default-features = false, features = ["v1_20"] }
-schemars = "0.8"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-tokio-stream = "0.1"
-tracing = "0.1"
-
-[dependencies.kube]
-version = "0.69.1"
-default-features = false
-features = [
-    "client",
-    "derive",
-    "native-tls",
-    "runtime",
+[workspace]
+members = [
+    "controller",
 ]
-
-[dependencies.kubert]
-version = "0.3.3"
-default-features = false
-features = [
-    "clap",
-    "runtime",
-]
-
-[dependencies.tokio]
-version = "1"
-features = ["macros", "parking_lot", "rt", "rt-multi-thread"]
-
-[dev-dependencies]
-tokio-stream = "0.1"
-tokio-test = "0.4"
-tracing-subscriber = "0.3"
diff --git a/amd64.dockerfile b/amd64.dockerfile
@@ -7,16 +7,16 @@ FROM $RUST_IMAGE as build
 ARG TARGETARCH
 WORKDIR /build
 COPY Cargo.toml Cargo.lock .
-COPY src /build/src
+COPY controller /build/
 RUN --mount=type=cache,target=target \
     --mount=type=cache,from=rust:1.59.0,source=/usr/local/cargo,target=/usr/local/cargo \
     cargo fetch --locked
 RUN --mount=type=cache,target=target \
     --mount=type=cache,from=rust:1.59.0,source=/usr/local/cargo,target=/usr/local/cargo \
-    cargo build --frozen --target=x86_64-unknown-linux-gnu --release --package=linkerd-failover && \
-    mv target/x86_64-unknown-linux-gnu/release/linkerd-failover /tmp/
+    cargo build --frozen --target=x86_64-unknown-linux-gnu --release --package=linkerd-failover-controller && \
+    mv target/x86_64-unknown-linux-gnu/release/linkerd-failover-controller /tmp/
 
 # Creates a minimal runtime image with the operator binary.
 FROM $RUNTIME_IMAGE
-COPY --from=build /tmp/linkerd-failover /bin/
-ENTRYPOINT ["/bin/linkerd-failover"]
+COPY --from=build /tmp/linkerd-failover-controller /bin/
+ENTRYPOINT ["/bin/linkerd-failover-controller"]
diff --git a/arm.dockerfile b/arm.dockerfile
@@ -11,18 +11,18 @@ RUN apt-get update && \
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
 WORKDIR /build
 COPY Cargo.toml Cargo.lock .
-COPY src /build/src
+COPY controller /build/
 RUN --mount=type=cache,target=target \
     --mount=type=cache,from=rust:1.59.0,source=/usr/local/cargo,target=/usr/local/cargo \
     cargo fetch --locked
 # XXX(ver) we can't easily cross-compile against openssl, so use rustls on arm.
 RUN --mount=type=cache,target=target \
     --mount=type=cache,from=rust:1.59.0,source=/usr/local/cargo,target=/usr/local/cargo \
     cargo build --frozen --release --target=armv7-unknown-linux-gnueabihf \
-        --package=linkerd-failover --no-default-features --features="rustls" && \
-    mv target/armv7-unknown-linux-gnueabihf/release/linkerd-failover /tmp/
+        --package=linkerd-failover-controller --no-default-features --features="rustls" && \
+    mv target/armv7-unknown-linux-gnueabihf/release/linkerd-failover-controller /tmp/
 
 # Creates a minimal runtime image with the operator binary.
 FROM --platform=linux/arm $RUNTIME_IMAGE
-COPY --from=build /tmp/linkerd-failover /bin/
-ENTRYPOINT ["/bin/linkerd-failover"]
+COPY --from=build /tmp/linkerd-failover-controller /bin/
+ENTRYPOINT ["/bin/linkerd-failover-controller"]
diff --git a/arm64.dockerfile b/arm64.dockerfile
@@ -11,18 +11,18 @@ RUN apt-get update && \
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
 WORKDIR /build
 COPY Cargo.toml Cargo.lock .
-COPY src /build/src
+COPY controller /build/
 RUN --mount=type=cache,target=target \
     --mount=type=cache,from=rust:1.59.0,source=/usr/local/cargo,target=/usr/local/cargo \
     cargo fetch --locked
 # XXX(ver) we can't easily cross-compile against openssl, so use rustls on arm.
 RUN --mount=type=cache,target=target \
     --mount=type=cache,from=rust:1.59.0,source=/usr/local/cargo,target=/usr/local/cargo \
     cargo build --frozen --release --target=aarch64-unknown-linux-gnu \
-        --package=linkerd-failover --no-default-features --features="rustls-tls" && \
-    mv target/aarch64-unknown-linux-gnu/release/linkerd-failover /tmp/
+        --package=linkerd-failover-controller --no-default-features --features="rustls-tls" && \
+    mv target/aarch64-unknown-linux-gnu/release/linkerd-failover-controller /tmp/
 
 # Creates a minimal runtime image with the operator binary.
 FROM --platform=linux/arm64 $RUNTIME_IMAGE
-COPY --from=build /tmp/linkerd-failover /bin/
-ENTRYPOINT ["/bin/linkerd-failover"]
+COPY --from=build /tmp/linkerd-failover-controller /bin/
+ENTRYPOINT ["/bin/linkerd-failover-controller"]
diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "linkerd-failover-controller"
+version = "0.1.0"
+authors = ["Linkerd Authors <[email protected]>"]
+edition = "2018"
+license = "Apache-2.0"
+
+[dependencies]
+anyhow = "1"
+clap = { version = "3", default-features = false, features = ["derive", "env", "std"] }
+futures = "0.3"
+k8s-openapi = { version = "0.14", default-features = false, features = ["v1_20"] }
+schemars = "0.8"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+tokio-stream = "0.1"
+tracing = "0.1"
+
+[dependencies.kube]
+version = "0.69.1"
+default-features = false
+features = [
+    "client",
+    "derive",
+    "native-tls",
+    "runtime",
+]
+
+[dependencies.kubert]
+version = "0.3.3"
+default-features = false
+features = [
+    "clap",
+    "runtime",
+]
+
+[dependencies.tokio]
+version = "1"
+features = ["macros", "parking_lot", "rt", "rt-multi-thread"]
+
+[dev-dependencies]
+tokio-stream = "0.1"
+tokio-test = "0.4"
+tracing-subscriber = "0.3"
diff --git a/src/endpoints.rs → controller/src/endpoints.rs b/src/endpoints.rs → controller/src/endpoints.rs
diff --git a/src/lib.rs → controller/src/lib.rs b/src/lib.rs → controller/src/lib.rs
diff --git a/src/main.rs → controller/src/main.rs b/src/main.rs → controller/src/main.rs
@@ -4,7 +4,7 @@
 use anyhow::{bail, Result};
 use clap::Parser;
 use kube::api::ListParams;
-use linkerd_failover::{endpoints, traffic_split, Ctx};
+use linkerd_failover_controller::{endpoints, traffic_split, Ctx};
 use tokio::{sync::mpsc, time};
 use tracing::Instrument;
 

diff --git a/src/traffic_split.rs → controller/src/traffic_split.rs b/src/traffic_split.rs → controller/src/traffic_split.rs