github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85490 from sallyom/set-resources-no-error-no-change

Browse Source 
don't error if set-resources patch is empty
This commit is contained in:
Kubernetes Prow Robot 2019-11-27 08:25:20 -08:00 committed by GitHub
commit 7c87b5fb55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources.go
View File

@ -267,7 +267,6 @@ func (o *SetResourcesOptions) Run() error {
//no changes //no changes
if string(patch.Patch) == "{}" || len(patch.Patch) == 0 { if string(patch.Patch) == "{}" || len(patch.Patch) == 0 {
allErrs = append(allErrs, fmt.Errorf("info: %s was not changed\n", name))
continue continue
} }

1
staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject.go
View File

@ -247,7 +247,6 @@ func (o *SubjectOptions) Run(fn updateSubjects) error {
//no changes //no changes
if string(patch.Patch) == "{}" || len(patch.Patch) == 0 { if string(patch.Patch) == "{}" || len(patch.Patch) == 0 {
allErrs = append(allErrs, fmt.Errorf("info: %s was not changed\n", name))
continue continue
} }