Merge pull request #96402 from lala123912/cc_4

fix staticcheck:vendor/k8s.io/kubectl/pkg/cmd/scale

Kubernetes-commit: 56644827142ef09bca3d3c228d3e5e89c84ecc5a
This commit is contained in:
Kubernetes Publisher 2020-12-08 17:28:35 -08:00
commit 655e2db3c7
4 changed files with 9 additions and 9 deletions

4
Godeps/Godeps.json generated
View File

@ -924,11 +924,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "4a626d306b98"
"Rev": "d10e393578ca"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2456ebdaba22"
"Rev": "8f01ffc4dcb8"
},
{
"ImportPath": "k8s.io/cli-runtime",

8
go.mod
View File

@ -34,8 +34,8 @@ require (
github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22
k8s.io/api v0.0.0-20201209045732-d10e393578ca
k8s.io/apimachinery v0.0.0-20201209005534-8f01ffc4dcb8
k8s.io/cli-runtime v0.0.0-20201114091436-bb334014705f
k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9
k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
@ -49,8 +49,8 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22
k8s.io/api => k8s.io/api v0.0.0-20201209045732-d10e393578ca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201209005534-8f01ffc4dcb8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201114091436-bb334014705f
k8s.io/client-go => k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201118094405-356aa54a63d2

4
go.sum
View File

@ -634,8 +634,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.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ=
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/api v0.0.0-20201209045732-d10e393578ca/go.mod h1:xjrWEKNUnu5XTPx3c+1VDDkb3vXmUiTwwHureX1M32c=
k8s.io/apimachinery v0.0.0-20201209005534-8f01ffc4dcb8/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/cli-runtime v0.0.0-20201114091436-bb334014705f/go.mod h1:tBt/bdEvlky4pwrXkvcYnl7N6IlY9j7NHTWBUSZZ56c=
k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9/go.mod h1:UTdyXFcu9VZV4qQRKGXCa0KdMX4HTCXClRs4s7yFdDQ=
k8s.io/code-generator v0.0.0-20201118094405-356aa54a63d2/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=

View File

@ -209,7 +209,7 @@ func (o *ScaleOptions) RunScale() error {
}
infos := []*resource.Info{}
err = r.Visit(func(info *resource.Info, err error) error {
r.Visit(func(info *resource.Info, err error) error {
if err == nil {
infos = append(infos, info)
}