Skip to content

Commit 46344df

Browse files
committed
Add AWS_LC_SYS_CFLAGS, drop arm/v7 support
1 parent 800b16f commit 46344df

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/release-cni-plugin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
build-cni-plugin-image \
4848
--cache-from type=local,src="$RUNNER_TEMP/.buildx-cache" \
4949
--cache-to type=local,dest="$RUNNER_TEMP/.buildx-cache",mode=max \
50-
--platform linux/amd64,linux/arm64,linux/arm/v7
50+
--platform linux/amd64,linux/arm64
5151
- run: just-dev prune-action-cache "$RUNNER_TEMP/.buildx-cache"
5252

5353
# Only publish images on release
@@ -63,7 +63,7 @@ jobs:
6363
build-cni-plugin-image \
6464
--cache-from type=local,src="$RUNNER_TEMP/.buildx-cache" \
6565
--cache-to type=local,dest="$RUNNER_TEMP/.buildx-cache",mode=max \
66-
--platform linux/amd64,linux/arm64,linux/arm/v7 \
66+
--platform linux/amd64,linux/arm64 \
6767
--output type=registry
6868
- if: needs.meta.outputs.mode == 'release'
6969
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159

Dockerfile-cni-plugin

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,14 @@ RUN --mount=type=cache,target=target \
2929
target=$(case "$TARGETARCH" in \
3030
amd64) echo x86_64-unknown-linux-musl ;; \
3131
arm64) echo aarch64-unknown-linux-musl ;; \
32-
arm) echo armv7-unknown-linux-musleabihf ;; \
3332
*) echo "unsupported architecture: $TARGETARCH" >&2; exit 1 ;; \
3433
esac) && \
35-
just cni-repair-controller arch="$TARGETARCH" profile=release build && \
34+
cflags=$(case "$TARGETARCH" in \
35+
amd64) echo '' ;; \
36+
arm64) echo '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld' ;; \
37+
*) echo "unsupported architecture: $TARGETARCH" >&2; exit 1 ;; \
38+
esac) && \
39+
AWS_LC_SYS_CFLAGS=$cflags just cni-repair-controller arch="$TARGETARCH" profile=release build && \
3640
mv "target/$target/release/linkerd-cni-repair-controller" .
3741

3842
FROM --platform=$TARGETPLATFORM alpine:3.22.1 as runtime

0 commit comments

Comments
 (0)