kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use utils.net to parse ports instead of atoi (#89120) 

Kubernetes-commit: 363bb3914296d5330dce29631fb6003c335cfcf7
This commit is contained in:
Jie Shen 2020-04-22 11:55:52 +08:00 committed by Kubernetes Publisher
parent 02d5de007a
commit 6873ed332b
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -592,19 +592,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "6459cdd1b290"
"Rev": "2ca06ba83edf"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "06deae5c9c2c"
"Rev": "ec2e4e97fca4"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b3b874faea7e"
"Rev": "ede92e0fe62d"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "8582c5203e4b"
"Rev": "c7033cd69c96"
},
{
"ImportPath": "k8s.io/gengo",

16
go.mod
View File

@ -41,10 +41,10 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200416141345-6459cdd1b290
k8s.io/apimachinery v0.0.0-20200413181316-06deae5c9c2c
k8s.io/client-go v0.0.0-20200416141618-b3b874faea7e
k8s.io/component-base v0.0.0-20200410024425-8582c5203e4b
k8s.io/api v0.0.0-20200421221621-2ca06ba83edf
k8s.io/apimachinery v0.0.0-20200418021153-ec2e4e97fca4
k8s.io/client-go v0.0.0-20200419061629-ede92e0fe62d
k8s.io/component-base v0.0.0-20200421141809-c7033cd69c96
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200403204345-e1beb1bd0f35
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
@ -56,8 +56,8 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200416141345-6459cdd1b290
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200413181316-06deae5c9c2c
k8s.io/client-go => k8s.io/client-go v0.0.0-20200416141618-b3b874faea7e
k8s.io/component-base => k8s.io/component-base v0.0.0-20200410024425-8582c5203e4b
k8s.io/api => k8s.io/api v0.0.0-20200421221621-2ca06ba83edf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200418021153-ec2e4e97fca4
k8s.io/client-go => k8s.io/client-go v0.0.0-20200419061629-ede92e0fe62d
k8s.io/component-base => k8s.io/component-base v0.0.0-20200421141809-c7033cd69c96
)

8
go.sum
View File

@ -362,10 +362,10 @@ gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200416141345-6459cdd1b290/go.mod h1:S9B4jsMc6M3MS++oeNW7L3ZGLfPUaKMbO/PUWQcC+gU=
k8s.io/apimachinery v0.0.0-20200413181316-06deae5c9c2c/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo=
k8s.io/client-go v0.0.0-20200416141618-b3b874faea7e/go.mod h1:vgr2vFke0wRBJ0wk/V4enjpRXaxESpiJJ3yM447SVoE=
k8s.io/component-base v0.0.0-20200410024425-8582c5203e4b/go.mod h1:grU+F0MqA5eYgNvtft1YM+zHsU4YH2WW18+1G97EZYQ=
k8s.io/api v0.0.0-20200421221621-2ca06ba83edf/go.mod h1:ulbB/6H6vVXAkqfLv6nAqwp3OAksqUGzbqvrQ8uWFCs=
k8s.io/apimachinery v0.0.0-20200418021153-ec2e4e97fca4/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo=
k8s.io/client-go v0.0.0-20200419061629-ede92e0fe62d/go.mod h1:MfZqc6x+OyzDrOdkgL/RYZ5ymCNuAHRZE5kZKxY7dRc=
k8s.io/component-base v0.0.0-20200421141809-c7033cd69c96/go.mod h1:Oy1vNndAYVfSxhqiwZjXewh3892JpXigIluVU11U1XA=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

3
pkg/server/config.go
View File

@ -66,6 +66,7 @@ import (
"k8s.io/component-base/logs"
"k8s.io/klog"
openapicommon "k8s.io/kube-openapi/pkg/common"
utilsnet "k8s.io/utils/net"
// install apis
_ "k8s.io/apiserver/pkg/apis/apiserver/install"
@ -731,7 +732,7 @@ func (s *SecureServingInfo) HostPort() (string, int, error) {
if err != nil {
return "", 0, fmt.Errorf("failed to get port from listener address %q: %v", addr, err)
}
port, err := strconv.Atoi(portStr)
port, err := utilsnet.ParsePort(portStr, true)
if err != nil {
return "", 0, fmt.Errorf("invalid non-numeric port %q", portStr)
}