Skip to content

K
k3s
Unverified Commit a241087f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #57457 from vfreex/fix-port-forward-ipv6

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. client-go: Fix broken TCP6 listen for port forwarding **What this PR does / why we need it**: The IPV6 loopback address `::1` is enclosed in square brackets twice, which cause a failure to listen on the TCP6 port. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note Fix an issue where port forwarding doesn't forward local TCP6 ports to the pod ``` /area ipv6 /sig cli
parents 8f71d6d8 942ff28e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
staging/src/k8s.io/client-go/tools/portforward/portforward.go
View file @ a241087f
...@@ -185,7 +185,7 @@ func (pf *PortForwarder) forward() error { ...@@ -185,7 +185,7 @@ func (pf *PortForwarder) forward() error {
// If both listener creation fail, an error is raised. // If both listener creation fail, an error is raised.
func (pf *PortForwarder) listenOnPort(port *ForwardedPort) error { func (pf *PortForwarder) listenOnPort(port *ForwardedPort) error {
errTcp4 := pf.listenOnPortAndAddress(port, "tcp4", "127.0.0.1") errTcp4 := pf.listenOnPortAndAddress(port, "tcp4", "127.0.0.1")
errTcp6 := pf.listenOnPortAndAddress(port, "tcp6", "[::1]") errTcp6 := pf.listenOnPortAndAddress(port, "tcp6", "::1")
if errTcp4 != nil && errTcp6 != nil { if errTcp4 != nil && errTcp6 != nil {
return fmt.Errorf("All listeners failed to create with the following errors: %s, %s", errTcp4, errTcp6) return fmt.Errorf("All listeners failed to create with the following errors: %s, %s", errTcp4, errTcp6)
} }
...@@ -220,7 +220,7 @@ func (pf *PortForwarder) getListener(protocol string, hostname string, port *For ...@@ -220,7 +220,7 @@ func (pf *PortForwarder) getListener(protocol string, hostname string, port *For
} }
port.Local = uint16(localPortUInt) port.Local = uint16(localPortUInt)
if pf.out != nil { if pf.out != nil {
fmt.Fprintf(pf.out, "Forwarding from %s:%d -> %d\n", hostname, localPortUInt, port.Remote) fmt.Fprintf(pf.out, "Forwarding from %s -> %d\n", net.JoinHostPort(hostname, strconv.Itoa(int(localPortUInt))), port.Remote)
} }
return listener, nil return listener, nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment