Skip to content

K
k3s
Unverified Commit 362de68b authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #68353 from wgliang/fixbug/handle-close-not-check-err

fix bug not check error before defer conn.Close()
parents 3d7d35ee f5ff0208
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
test/images/netexec/netexec.go
View file @ 362de68b
...@@ -357,6 +357,7 @@ func startUDPServer(udpPort int) { ...@@ -357,6 +357,7 @@ func startUDPServer(udpPort int) {
serverAddress, err := net.ResolveUDPAddr("udp", fmt.Sprintf(":%d", udpPort)) serverAddress, err := net.ResolveUDPAddr("udp", fmt.Sprintf(":%d", udpPort))
assertNoError(err) assertNoError(err)
serverConn, err := net.ListenUDP("udp", serverAddress) serverConn, err := net.ListenUDP("udp", serverAddress)
assertNoError(err)
defer serverConn.Close() defer serverConn.Close()
buf := make([]byte, 1024) buf := make([]byte, 1024)
......
test/images/netexec/pod.yaml
View file @ 362de68b
...@@ -7,7 +7,7 @@ metadata: ...@@ -7,7 +7,7 @@ metadata:
spec: spec:
containers: containers:
- name: netexec - name: netexec
image: gcr.io/kubernetes-e2e-test-images/netexec-amd64:1.0 image: gcr.io/kubernetes-e2e-test-images/netexec-amd64:1.1
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
test/utils/image/manifest.go
View file @ 362de68b
...@@ -105,7 +105,7 @@ var ( ...@@ -105,7 +105,7 @@ var (
MounttestUser = ImageConfig{e2eRegistry, "mounttest-user", "1.0"} MounttestUser = ImageConfig{e2eRegistry, "mounttest-user", "1.0"}
Nautilus = ImageConfig{e2eRegistry, "nautilus", "1.0"} Nautilus = ImageConfig{e2eRegistry, "nautilus", "1.0"}
Net = ImageConfig{e2eRegistry, "net", "1.0"} Net = ImageConfig{e2eRegistry, "net", "1.0"}
Netexec = ImageConfig{e2eRegistry, "netexec", "1.0"} Netexec = ImageConfig{e2eRegistry, "netexec", "1.1"}
Nettest = ImageConfig{e2eRegistry, "nettest", "1.0"} Nettest = ImageConfig{e2eRegistry, "nettest", "1.0"}
Nginx = ImageConfig{dockerLibraryRegistry, "nginx", "1.14-alpine"} Nginx = ImageConfig{dockerLibraryRegistry, "nginx", "1.14-alpine"}
NginxNew = ImageConfig{dockerLibraryRegistry, "nginx", "1.15-alpine"} NginxNew = ImageConfig{dockerLibraryRegistry, "nginx", "1.15-alpine"}
......
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