Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade alpine, use iptables-legacy #327

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Upgrade alpine, use iptables-legacy #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-cni-plugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cni-plugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions proxy-init/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}

Expand Down
4 changes: 2 additions & 2 deletions proxy-init/cmd/root_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading