Merge pull request #60922 from hzxuzhonghu/userspace-proxier-cleanup

pkg/proxy/userspace/BUILD

@@ -14,7 +14,6 @@ go_library(
         "proxier.go",
         "proxysocket.go",
         "roundrobin.go",
-        "udp_server.go",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [
             "rlimit.go",

pkg/proxy/userspace/proxier_test.go

@@ -86,6 +86,31 @@ func waitForClosedPortUDP(p *Proxier, proxyPort int) error {
 	return fmt.Errorf("port %d still open", proxyPort)
 }
 
+// udpEchoServer is a simple echo server in UDP, intended for testing the proxy.
+type udpEchoServer struct {
+	net.PacketConn
+}
+
+func newUDPEchoServer() (*udpEchoServer, error) {
+	packetconn, err := net.ListenPacket("udp", ":0")
+	if err != nil {
+		return nil, err
+	}
+	return &udpEchoServer{packetconn}, nil
+}
+
+func (r *udpEchoServer) Loop() {
+	var buffer [4096]byte
+	for {
+		n, cliAddr, err := r.ReadFrom(buffer[0:])
+		if err != nil {
+			fmt.Printf("ReadFrom failed: %v\n", err)
+			continue
+		}
+		r.WriteTo(buffer[0:n], cliAddr)
+	}
+}
+
 var tcpServerPort int32
 var udpServerPort int32
 

pkg/proxy/userspace/udp_server.go

-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package userspace
-
-import (
-	"fmt"
-	"net"
-)
-
-// udpEchoServer is a simple echo server in UDP, intended for testing the proxy.
-type udpEchoServer struct {
-	net.PacketConn
-}
-
-func (r *udpEchoServer) Loop() {
-	var buffer [4096]byte
-	for {
-		n, cliAddr, err := r.ReadFrom(buffer[0:])
-		if err != nil {
-			fmt.Printf("ReadFrom failed: %v\n", err)
-			continue
-		}
-		r.WriteTo(buffer[0:n], cliAddr)
-	}
-}
-
-func newUDPEchoServer() (*udpEchoServer, error) {
-	packetconn, err := net.ListenPacket("udp", ":0")
-	if err != nil {
-		return nil, err
-	}
-	return &udpEchoServer{packetconn}, nil
-}
-
-/*
-func main() {
-	r,_ := newUDPEchoServer()
-	r.Loop()
-}
-*/

pkg/proxy/winuserspace/BUILD

@@ -14,7 +14,6 @@ go_library(
         "proxysocket.go",
         "roundrobin.go",
         "types.go",
-        "udp_server.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/proxy/winuserspace",
     deps = [

pkg/proxy/winuserspace/proxier_test.go

@@ -84,6 +84,31 @@ func waitForClosedPortUDP(p *Proxier, proxyPort int) error {
 	return fmt.Errorf("port %d still open", proxyPort)
 }
 
+// udpEchoServer is a simple echo server in UDP, intended for testing the proxy.
+type udpEchoServer struct {
+	net.PacketConn
+}
+
+func newUDPEchoServer() (*udpEchoServer, error) {
+	packetconn, err := net.ListenPacket("udp", ":0")
+	if err != nil {
+		return nil, err
+	}
+	return &udpEchoServer{packetconn}, nil
+}
+
+func (r *udpEchoServer) Loop() {
+	var buffer [4096]byte
+	for {
+		n, cliAddr, err := r.ReadFrom(buffer[0:])
+		if err != nil {
+			fmt.Printf("ReadFrom failed: %v\n", err)
+			continue
+		}
+		r.WriteTo(buffer[0:n], cliAddr)
+	}
+}
+
 var tcpServerPort int32
 var udpServerPort int32
 

pkg/proxy/winuserspace/udp_server.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package winuserspace
-
-import (
-	"fmt"
-	"net"
-)
-
-// udpEchoServer is a simple echo server in UDP, intended for testing the proxy.
-type udpEchoServer struct {
-	net.PacketConn
-}
-
-func (r *udpEchoServer) Loop() {
-	var buffer [4096]byte
-	for {
-		n, cliAddr, err := r.ReadFrom(buffer[0:])
-		if err != nil {
-			fmt.Printf("ReadFrom failed: %v\n", err)
-			continue
-		}
-		r.WriteTo(buffer[0:n], cliAddr)
-	}
-}
-
-func newUDPEchoServer() (*udpEchoServer, error) {
-	packetconn, err := net.ListenPacket("udp", ":0")
-	if err != nil {
-		return nil, err
-	}
-	return &udpEchoServer{packetconn}, nil
-}