Skip to content

Commit 653396d

Browse files
authored
Merge pull request kubernetes#87405 from gavinfish/kubectl_pkg_cmd_set
Staticcheck: vendor/k8s.io/kubectl/pkg/cmd/set and .../edit
2 parents 7ad2eb0 + 2b8e60b commit 653396d

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

hack/.staticcheck_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ vendor/k8s.io/client-go/restmapper
7676
vendor/k8s.io/client-go/tools/leaderelection
7777
vendor/k8s.io/client-go/transport
7878
vendor/k8s.io/component-base/metrics
79-
vendor/k8s.io/kubectl/pkg/cmd/edit
8079
vendor/k8s.io/kubectl/pkg/cmd/get
8180
vendor/k8s.io/kubectl/pkg/cmd/scale
82-
vendor/k8s.io/kubectl/pkg/cmd/set
8381
vendor/k8s.io/kubectl/pkg/cmd/testing
8482
vendor/k8s.io/metrics/pkg/client/custom_metrics

staging/src/k8s.io/kubectl/pkg/cmd/edit/edit.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ limitations under the License.
1717
package edit
1818

1919
import (
20-
"fmt"
21-
2220
"github.com/spf13/cobra"
2321

2422
"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -77,7 +75,7 @@ func NewCmdEdit(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra
7775
DisableFlagsInUseLine: true,
7876
Short: i18n.T("Edit a resource on the server"),
7977
Long: editLong,
80-
Example: fmt.Sprintf(editExample),
78+
Example: editExample,
8179
Run: func(cmd *cobra.Command, args []string) {
8280
if err := o.Complete(f, args, cmd); err != nil {
8381
cmdutil.CheckErr(err)

staging/src/k8s.io/kubectl/pkg/cmd/set/helper.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func selectString(s, spec string) bool {
5454
pos := 0
5555
match := true
5656
parts := strings.Split(spec, "*")
57+
Loop:
5758
for i, part := range parts {
5859
if len(part) == 0 {
5960
continue
@@ -69,7 +70,7 @@ func selectString(s, spec string) bool {
6970
// last part does not exactly match remaining part of string
7071
case i == (len(parts)-1) && len(s) != (len(part)+next):
7172
match = false
72-
break
73+
break Loop
7374
default:
7475
pos = next
7576
}

staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func NewCmdEnv(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Co
151151
DisableFlagsInUseLine: true,
152152
Short: "Update environment variables on a pod template",
153153
Long: envLong,
154-
Example: fmt.Sprintf(envExample),
154+
Example: envExample,
155155
Run: func(cmd *cobra.Command, args []string) {
156156
cmdutil.CheckErr(o.Complete(f, cmd, args))
157157
cmdutil.CheckErr(o.Validate())

staging/src/k8s.io/kubectl/pkg/cmd/set/set_selector.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ func (o *SetSelectorOptions) RunSelector() error {
175175
r := o.ResourceFinder.Do()
176176

177177
return r.Visit(func(info *resource.Info, err error) error {
178+
if err != nil {
179+
return err
180+
}
178181
patch := &Patch{Info: info}
179182

180183
if len(o.resourceVersion) != 0 {

staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ func TestAddSubject(t *testing.T) {
411411
}
412412
for _, tt := range tests {
413413
changed := false
414-
got := []rbacv1.Subject{}
414+
var got []rbacv1.Subject
415415
if changed, got = addSubjects(tt.existing, tt.subjects); (changed != false) != tt.wantChange {
416416
t.Errorf("%q. addSubjects() changed = %v, wantChange = %v", tt.Name, changed, tt.wantChange)
417417
}

0 commit comments

Comments
 (0)