Skip to content

Commit 46145d7

Browse files
dilyevskyclaude
andcommitted
[tunnel] fix utiliptables.New calls for k8s v1.34
k8s.io/kubernetes v1.34 removed the exec.Interface parameter from utiliptables.New — it now only takes the protocol. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 9a9c92f commit 46145d7

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkg/tunnel/router/client_netlink_linux.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"golang.org/x/sync/errgroup"
1717
"golang.zx2c4.com/wireguard/tun"
1818
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
19-
utilexec "k8s.io/utils/exec"
19+
2020

2121
"github.com/apoxy-dev/apoxy/pkg/netstack"
2222
"github.com/apoxy-dev/apoxy/pkg/tunnel/connection"
@@ -111,8 +111,8 @@ func newClientNetlinkRouter(opts ...Option) (*ClientNetlinkRouter, error) {
111111
return &ClientNetlinkRouter{
112112
tunDev: tunDev,
113113
tunLink: tunLink,
114-
iptV4: utiliptables.New(utilexec.New(), utiliptables.ProtocolIPv4),
115-
iptV6: utiliptables.New(utilexec.New(), utiliptables.ProtocolIPv6),
114+
iptV4: utiliptables.New(utiliptables.ProtocolIPv4),
115+
iptV6: utiliptables.New(utiliptables.ProtocolIPv6),
116116
smux: connection.NewSrcMuxedConn(),
117117
options: options,
118118
closed: make(chan struct{}),

pkg/tunnel/router/icx_netlink_linux.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"gvisor.dev/gvisor/pkg/tcpip"
2727
proxyutil "k8s.io/kubernetes/pkg/proxy/util"
2828
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
29-
utilexec "k8s.io/utils/exec"
29+
3030

3131
"github.com/apoxy-dev/apoxy/pkg/netstack"
3232
"github.com/apoxy-dev/apoxy/pkg/tunnel/connection"
@@ -179,8 +179,8 @@ func NewICXNetlinkRouter(opts ...Option) (*ICXNetlinkRouter, error) {
179179
ingressFilter: ingressFilter,
180180
pcapFile: pcapFile,
181181
tun: tun,
182-
iptV4: utiliptables.New(utilexec.New(), utiliptables.ProtocolIPv4),
183-
iptV6: utiliptables.New(utilexec.New(), utiliptables.ProtocolIPv6),
182+
iptV4: utiliptables.New(utiliptables.ProtocolIPv4),
183+
iptV6: utiliptables.New(utiliptables.ProtocolIPv6),
184184
extAddrs: extAddrsList,
185185
}, nil
186186
}

pkg/tunnel/router/server_netlink_linux.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"golang.zx2c4.com/wireguard/tun"
1818
proxyutil "k8s.io/kubernetes/pkg/proxy/util"
1919
utiliptables "k8s.io/kubernetes/pkg/util/iptables"
20-
utilexec "k8s.io/utils/exec"
20+
2121

2222
"github.com/apoxy-dev/apoxy/pkg/netstack"
2323
"github.com/apoxy-dev/apoxy/pkg/tunnel/connection"
@@ -120,8 +120,8 @@ func NewNetlinkRouter(opts ...Option) (*NetlinkRouter, error) {
120120
tunDev: tunDev,
121121
tunLink: tunLink,
122122

123-
iptV4: utiliptables.New(utilexec.New(), utiliptables.ProtocolIPv4),
124-
iptV6: utiliptables.New(utilexec.New(), utiliptables.ProtocolIPv6),
123+
iptV4: utiliptables.New(utiliptables.ProtocolIPv4),
124+
iptV6: utiliptables.New(utiliptables.ProtocolIPv6),
125125

126126
dmux: connection.NewDstMuxedConn(),
127127
}, nil

0 commit comments

Comments
 (0)