github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98749 from pandaamanda/kubectl_patch_error

Browse Source 
fix kubectl patch command error message
This commit is contained in:
Kubernetes Prow Robot 2021-03-04 19:32:21 -08:00 committed by GitHub
commit 6499f20d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
View File

@ -839,7 +839,7 @@ func (b *Builder) visitorResult() *Result {
return &Result{err: err} return &Result{err: err}
} }
} }
return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")} return &Result{err: fmt.Errorf("resource(s) were provided, but no name was specified")}
} }
return &Result{err: missingResourceError} return &Result{err: missingResourceError}
} }

4
staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go
View File

@ -794,13 +794,13 @@ func TestResourceErrors(t *testing.T) {
"resources but no selectors": { "resources but no selectors": {
args: []string{"pods"}, args: []string{"pods"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified")
}, },
}, },
"multiple resources but no selectors": { "multiple resources but no selectors": {
args: []string{"pods,deployments"}, args: []string{"pods,deployments"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified")
}, },
}, },
} }

4
staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go
View File

@ -311,13 +311,13 @@ func TestLabelErrors(t *testing.T) {
"resources but no selectors": { "resources but no selectors": {
args: []string{"pods", "app=bar"}, args: []string{"pods", "app=bar"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified")
}, },
}, },
"multiple resources but no selectors": { "multiple resources but no selectors": {
args: []string{"pods,deployments", "app=bar"}, args: []string{"pods,deployments", "app=bar"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified")
}, },
}, },
} }