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

Merge pull request #93247 from iotty/fix.govet 

[k8s.io/apiserver/pkg/server/filters]: fixup go vet warning

Kubernetes-commit: 9b1d273c89e03e9a85f84b034dd97509ed144712
This commit is contained in:
Kubernetes Publisher 2020-09-24 15:29:11 -07:00
parent 899cb1b459 b07fe5362d
commit eec9279056
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -676,11 +676,11 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "5b968b2f191f" "Rev": "829ed199f4e0"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "cba7285b7f29" "Rev": "f8c0b224ad5a"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",

8
go.mod
View File

@ -42,8 +42,8 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200922195808-5bb35d2636ca k8s.io/api v0.0.0-20200922195808-5bb35d2636ca
k8s.io/apimachinery v0.0.0-20200922195624-5b968b2f191f k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0
k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29 k8s.io/client-go v0.0.0-20200924040014-f8c0b224ad5a
k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
k8s.io/klog/v2 v2.2.0 k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
@ -55,7 +55,7 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20200922195808-5bb35d2636ca k8s.io/api => k8s.io/api v0.0.0-20200922195808-5bb35d2636ca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200922195624-5b968b2f191f k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0
k8s.io/client-go => k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29 k8s.io/client-go => k8s.io/client-go v0.0.0-20200924040014-f8c0b224ad5a
k8s.io/component-base => k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f k8s.io/component-base => k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
) )

4
go.sum
View File

@ -503,8 +503,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200922195808-5bb35d2636ca/go.mod h1:FAsg3Y/xcbFIbnyfpgARCQ8di7NxpIRZWbawQTkHTDo= k8s.io/api v0.0.0-20200922195808-5bb35d2636ca/go.mod h1:FAsg3Y/xcbFIbnyfpgARCQ8di7NxpIRZWbawQTkHTDo=
k8s.io/apimachinery v0.0.0-20200922195624-5b968b2f191f/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29/go.mod h1:Plj2rfLmeMYfAMuMgA/1EGuUaDxt78tvB9yfdi6fg6A= k8s.io/client-go v0.0.0-20200924040014-f8c0b224ad5a/go.mod h1:0TFqP6nDzw4kbUbyCXc0xcULYS2MvbAQIAaEhgnPPAA=
k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f/go.mod h1:KLUf6+rBAAlh4P5aX9t725mVdFgvY6LfYzl+QOveAV4= k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f/go.mod h1:KLUf6+rBAAlh4P5aX9t725mVdFgvY6LfYzl+QOveAV4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

2
pkg/server/filters/priority-and-fairness.go
View File

@ -135,7 +135,7 @@ func WithPriorityAndFairness(
w.Header().Set(responseHeaderMatchedFlowSchemaUID, string(classification.FlowSchemaUID)) w.Header().Set(responseHeaderMatchedFlowSchemaUID, string(classification.FlowSchemaUID))
handler.ServeHTTP(w, innerReq) handler.ServeHTTP(w, innerReq)
} }
digest := utilflowcontrol.RequestDigest{requestInfo, user} digest := utilflowcontrol.RequestDigest{RequestInfo: requestInfo, User: user}
fcIfc.Handle(ctx, digest, note, func(inQueue bool) { fcIfc.Handle(ctx, digest, note, func(inQueue bool) {
if inQueue { if inQueue {
noteWaitingDelta(1) noteWaitingDelta(1)