Merge branch 'main' into feat/enhance-troubleshooting

Signed-off-by: Shane Utt <shaneutt@linux.com>

Author: shaneutt

.github/workflows/build.yaml

@@ -15,7 +15,7 @@ jobs:
   rust-build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.1.7
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.7
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
@@ -58,28 +58,42 @@ jobs:
               - 'build/Containerfile.*'
       - name: Build controlplane Container Image
         if: steps.filter.outputs.sources
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          push: false
-          context: .
-          file: build/Containerfile.controlplane
-          tags: localhost/blixt-controlplane:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
+        run: |
+          mkdir -p target/ &&
+          podman build \
+            --userns=host \
+            --file build/Containerfile.controlplane \
+            --volume "$(pwd):/workspace" \
+            --volume "$(pwd)/target:$(pwd)/target/" \
+            --build-arg BUILD_TIMESTAMP="$(date +%s%3N)" \
+            --build-arg UID="0" \
+            --build-arg GID="0" \
+            --build-arg WORK_DIR="$(pwd)" \
+            --tag localhost/blixt-controlplane:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
       - name: Build dataplane Container Image
-        if: steps.filter.outputs.sources
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          push: false
-          context: .
-          file: build/Containerfile.dataplane
-          tags: localhost/blixt-dataplane:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
+        run: |
+          podman build \
+            --userns=host \
+            --file build/Containerfile.dataplane \
+            --volume "$(pwd):/workspace" \
+            --volume "$(pwd)/target:$(pwd)/target/" \
+            --build-arg BUILD_TIMESTAMP="$(date +%s%3N)" \
+            --build-arg UID="0" \
+            --build-arg GID="0" \
+            --build-arg WORK_DIR="$(pwd)" \
+            --tag localhost/blixt-dataplane:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
       - name: Build udp-test-server Container Image
-        if: steps.filter.outputs.sources
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          push: false
-          context: .
-          file: build/Containerfile.udp-test-server
-          tags: localhost/blixt-udp-test-server:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
+        run: |
+          podman build \
+            --userns=host \
+            --file build/Containerfile.udp-test-server \
+            --volume "$(pwd):/workspace" \
+            --volume "$(pwd)/target:$(pwd)/target/" \
+            --build-arg BUILD_TIMESTAMP="$(date +%s%3N)" \
+            --build-arg UID="0" \
+            --build-arg GID="0" \
+            --build-arg WORK_DIR="$(pwd)" \
+            --tag localhost/blixt-udp-test-server:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
       - name: Install kind and kubectl
         uses: helm/kind-action@b72c923563e6e80ea66e8e8c810798cc73e97e5e # current main, includes cloud-provider-kind support
         if: steps.filter.outputs.sources
@@ -89,12 +103,14 @@ jobs:
           kubectl_version: 'v1.33.3'
       - name: Install Rust
         if: steps.filter.outputs.sources
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # v1
+        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
         with:
           toolchain: stable
       - name: Run Integration Tests
         if: steps.filter.outputs.sources
         run: |
+          # kind load broken for podman https://github.com/kubernetes-sigs/kind/issues/3945
           export REGISTRY="localhost"
           export TAG="pr-${{ github.event.pull_request.number }}-${{ github.sha }}"
-          make test.integration
+          sudo chown -R "$(id -u):$(id -g)" target/
+          make test.integration.reuse

Cargo.lock

@@ -1346,6 +1346,7 @@ dependencies = [
  "aya-log",
  "clap",
  "common",
+ "thiserror 2.0.14",
  "tokio",
  "tracing",
  "tracing-log",
@@ -1370,11 +1371,11 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1798,17 +1799,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1819,7 +1811,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1828,12 +1820,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -2081,9 +2067,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.142"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "itoa",
  "memchr",
@@ -2213,15 +2199,15 @@ checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
 dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2522,13 +2508,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "thread_local",
  "tracing",

Cargo.toml

@@ -34,7 +34,7 @@ network-types = { version = "0.0.8", default-features = false }
 prost = { version = "0.13.5", default-features = false }
 regex = { version = "1", default-features = true }
 serde = { version = "1.0.219", default-features = false }
-serde_json = { version = "1.0.142", default-features = false }
+serde_json = { version = "1.0.143", default-features = false }
 serde_yaml = { version = "0.9.34", default-features = false }
 thiserror = { version = "2.0.12", default-features = true }
 tokio = { version = "1.47.1", default-features = false }

Makefile

@@ -60,10 +60,14 @@ clean: ## clean repo
 	rm $(TEST_CERTS_PATH)/{*.pem,*.csr}
 
 .PHONY: build
-build: ## Build dataplane
+build:
 	cargo xtask build-ebpf
 	cargo build
 
+build.reuse:
+	CARGO_HOME="$(WORK_DIR)/target" RUSTUP_HOME="$(WORK_DIR)/target" cargo xtask build-ebpf
+	CARGO_HOME="$(WORK_DIR)/target" RUSTUP_HOME="$(WORK_DIR)/target" cargo build
+
 .PHONY: build.release
 build.release: ## Build dataplane release
 	cargo xtask build-ebpf --release
@@ -88,17 +92,26 @@ CONTROLPLANE_CONTAINERFILE ?= build/Containerfile.controlplane
 DATAPLANE_CONTAINERFILE ?= build/Containerfile.dataplane
 UDP_SERVER_CONTAINERFILE ?= build/Containerfile.udp-test-server
 
+UID = $(shell id -u)
+GID = $(shell id -g)
+WORK_DIR= $(shell pwd)
+BUILD_TIMESTAMP = $(shell date +%s%3N)
+CONTAINER_BUILD_ARGS = --userns=host --volume "$(WORK_DIR):/workspace" --volume "$(WORK_DIR)/target:$(WORK_DIR)/target/" \
+--build-arg BUILD_TIMESTAMP="$(BUILD_TIMESTAMP)" --build-arg UID="$(UID)" --build-arg GID="$(GID)" --build-arg WORK_DIR="$(WORK_DIR)" $(BUILD_ARGS)
+
 .PHONY: build.image.controlplane
 build.image.controlplane:
-	$(CONTAINER_RUNTIME) build $(BUILD_ARGS) --file=$(CONTROLPLANE_CONTAINERFILE) -t $(BLIXT_CONTROLPLANE_IMAGE):$(TAG) ./
-
+	mkdir -p target/
+	$(CONTAINER_RUNTIME) build $(CONTAINER_BUILD_ARGS) --file=$(CONTROLPLANE_CONTAINERFILE) --tag $(BLIXT_CONTROLPLANE_IMAGE):$(TAG)
 .PHONY: build.image.udp-test-server
 build.image.udp-test-server:
-	$(CONTAINER_RUNTIME) build $(BUILD_ARGS) --file=$(UDP_SERVER_CONTAINERFILE) -t $(BLIXT_UDP_SERVER_IMAGE):$(TAG) ./
+	mkdir -p target/
+	$(CONTAINER_RUNTIME) build $(CONTAINER_BUILD_ARGS) --file=$(UDP_SERVER_CONTAINERFILE) --tag $(BLIXT_UDP_SERVER_IMAGE):$(TAG)
 
 .PHONY: build.image.dataplane
 build.image.dataplane:
-	$(CONTAINER_RUNTIME) build $(BUILD_ARGS) --file=$(DATAPLANE_CONTAINERFILE) -t $(BLIXT_DATAPLANE_IMAGE):$(TAG) ./
+	mkdir -p target/
+	$(CONTAINER_RUNTIME) build $(CONTAINER_BUILD_ARGS) --file=$(DATAPLANE_CONTAINERFILE) --tag $(BLIXT_DATAPLANE_IMAGE):$(TAG)
 
 .PHONY: build.all.images
 build.all.images: 
@@ -131,7 +144,10 @@ test:
 	cargo test -vv --workspace --exclude tests-integration
 
 test.integration:
-	 cargo test --package tests-integration
+	cargo test --package tests-integration
+
+test.integration.reuse:
+	CARGO_HOME="$(WORK_DIR)/target" RUSTUP_HOME="$(WORK_DIR)/target" cargo test --package tests-integration
 
 .PHONY: test.gencert
 test.gencert: cfssl cfssljson

build/Containerfile.controlplane

@@ -2,42 +2,61 @@
 # Builder
 # ------------------------------------------------------------------------------
 
-FROM rust:alpine AS builder
-
-RUN apk add --no-cache clang lld
-
-WORKDIR /workspace
-
-ARG PROJECT_DIR=/workspace
-
-ARG BUILD_DIR=$PROJECT_DIR/build
-
-COPY Cargo.toml Cargo.lock ./
-
-COPY controlplane/ controlplane/
-
-COPY dataplane/ dataplane/
-
-COPY tests-integration/ tests-integration/
-
-COPY tools/ tools/
-
-COPY xtask/ xtask/
-
-RUN cargo build -p controlplane --target x86_64-unknown-linux-musl
+FROM debian:trixie-slim AS builder
+
+RUN apt update \
+    && apt install -y build-essential rustup
+
+ARG UID
+ARG GID
+ARG WORK_DIR
+RUN chown "${UID}:${GID}" ${WORK_DIR}
+USER ${UID}:${GID}
+
+ENV RUSTUP_HOME=${WORK_DIR}/target
+# allow re-using of cargo downloads trough saving in target/
+ENV CARGO_HOME=${WORK_DIR}/target
+
+RUN rustup install stable \
+    && rustup default stable
+
+ARG BUILD_TIMESTAMP
+WORKDIR ${WORK_DIR}
+
+# /workspace needs to be volume mounted
+# ${WORK_DIR}/target can be optionally volume mounted
+RUN echo "${BUILD_TIMESTAMP}" \
+    && date +%s \
+    && cp -a /workspace/Cargo.toml \
+    /workspace/Cargo.lock \
+    /workspace/.cargo/ \
+    /workspace/controlplane/ \
+    /workspace/dataplane/ \
+    /workspace/tests-integration/ \
+    /workspace/tools/ \
+    /workspace/xtask/ \
+    ${WORK_DIR}
+
+RUN date +%s \
+    && cargo build --package controlplane \
+    && date +%s \
+    && mkdir -p results/ \
+    && cp target/debug/controller results/
 
 # ------------------------------------------------------------------------------
 # Image
 # ------------------------------------------------------------------------------
 
-FROM alpine:latest
+FROM debian:trixie-slim
 
 LABEL org.opencontainers.image.source=https://github.com/kubernetes-sigs/blixt
 
 WORKDIR /
 
 USER 1000:1000
 
-COPY --from=builder /workspace/target/x86_64-unknown-linux-musl/debug/controller /controller
+ARG WORK_DIR
+
+COPY --from=builder ${WORK_DIR}/results/controller /controller
 
 ENTRYPOINT [ "/controller" ]