github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
fix bug not check error before defer conn.Close()
This commit is contained in:
k8s-ci-robot 2018-10-10 20:24:27 -07:00 committed by GitHub
commit 362de68bef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/netexec/VERSION
View File

@ -1 +1 @@
1.0 1.1

1
test/images/netexec/netexec.go
View File

@ -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)

2
test/images/netexec/pod.yaml
View File

@ -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

2
test/utils/image/manifest.go
View File

@ -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"}