diff --git a/Dockerfile b/Dockerfile index 7c8feef8..f0717063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \ ## Runtime ## -FROM --platform=$TARGETPLATFORM alpine:3.18.5 as runtime -RUN apk add iptables libcap && \ +FROM --platform=$TARGETPLATFORM alpine:3.19.0 as runtime +RUN apk add iptables-legacy iptables libcap && \ touch /run/xtables.lock && \ chmod 0666 /run/xtables.lock diff --git a/Dockerfile-cni-plugin b/Dockerfile-cni-plugin index 72856859..8bc2da01 100644 --- a/Dockerfile-cni-plugin +++ b/Dockerfile-cni-plugin @@ -34,7 +34,7 @@ RUN --mount=type=cache,target=target \ just cni-repair-controller arch="$TARGETARCH" profile=release build && \ mv "target/$target/release/linkerd-cni-repair-controller" . -FROM --platform=$TARGETPLATFORM alpine:3.18.5 as runtime +FROM --platform=$TARGETPLATFORM alpine:3.19.0 as runtime WORKDIR /linkerd RUN apk add \ # For inotifywait diff --git a/cni-plugin/main.go b/cni-plugin/main.go index 9a01be75..9eb68980 100644 --- a/cni-plugin/main.go +++ b/cni-plugin/main.go @@ -219,8 +219,8 @@ func cmdAdd(args *skel.CmdArgs) error { SimulateOnly: conf.ProxyInit.Simulate, NetNs: args.Netns, UseWaitFlag: conf.ProxyInit.UseWaitFlag, - FirewallBinPath: "iptables", - FirewallSaveBinPath: "iptables-save", + FirewallBinPath: "iptables-legacy", + FirewallSaveBinPath: "iptables-legacy-save", } // Check if there are any overridden ports to be skipped diff --git a/proxy-init/cmd/root.go b/proxy-init/cmd/root.go index 6b8d1504..3c8fa8f7 100644 --- a/proxy-init/cmd/root.go +++ b/proxy-init/cmd/root.go @@ -47,8 +47,8 @@ func newRootOptions() *RootOptions { TimeoutCloseWaitSecs: 0, LogFormat: "plain", LogLevel: "info", - FirewallBinPath: "iptables", - FirewallSaveBinPath: "iptables-save", + FirewallBinPath: "iptables-legacy", + FirewallSaveBinPath: "iptables-legacy-save", } } diff --git a/proxy-init/cmd/root_test.go b/proxy-init/cmd/root_test.go index 06908d7d..d1b31b28 100644 --- a/proxy-init/cmd/root_test.go +++ b/proxy-init/cmd/root_test.go @@ -23,8 +23,8 @@ func TestBuildFirewallConfiguration(t *testing.T) { ProxyUID: expectedProxyUserID, SimulateOnly: false, UseWaitFlag: false, - BinPath: "iptables", - SaveBinPath: "iptables-save", + BinPath: "iptables-legacy", + SaveBinPath: "iptables-legacy-save", } options := newRootOptions()