DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply fixes suggested by staticcheck

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-07-08 16:10:38 -04:00
parent 82c22e3969
commit 3d7a09347d
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
19 changed files with 26 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/nginx/flags.go
View file

@ -202,19 +202,19 @@ Takes the form "<host>:port". If not provided, no admission controller is starte
// check port collisions
if !ing_net.IsPortAvailable(*httpPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --http-port", *httpPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --http-port", *httpPort)
}
if !ing_net.IsPortAvailable(*httpsPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --https-port", *httpsPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --https-port", *httpsPort)
}
if !ing_net.IsPortAvailable(*defServerPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --default-server-port", *defServerPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --default-server-port", *defServerPort)
}
if *enableSSLPassthrough && !ing_net.IsPortAvailable(*sslProxyPort) {
return false, nil, fmt.Errorf("Port %v is already in use. Please check the flag --ssl-passthrough-proxy-port", *sslProxyPort)
return false, nil, fmt.Errorf("port %v is already in use. Please check the flag --ssl-passthrough-proxy-port", *sslProxyPort)
}
if !*enableSSLChainCompletion {
@ -222,7 +222,7 @@ Takes the form "<host>:port". If not provided, no admission controller is starte
}
if *publishSvc != "" && *publishStatusAddress != "" {
return false, nil, fmt.Errorf("Flags --publish-service and --publish-status-address are mutually exclusive")
return false, nil, fmt.Errorf("flags --publish-service and --publish-status-address are mutually exclusive")
}
nginx.HealthPath = *defHealthzURL

2
cmd/nginx/main_test.go
View file

@ -88,8 +88,6 @@ func TestHandleSigterm(t *testing.T) {
if code != 1 {
t.Errorf("Expected exit code 1 but %d received", code)
}
return
})
time.Sleep(1 * time.Second)