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

k8s-ci-robot · web-flow · commit 7c87b5fb55ca · 2019-11-27T08:25:20.000-08:00
don't error if set-resources patch is empty
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources.go
@@ -267,7 +267,6 @@ func (o *SetResourcesOptions) Run() error {
 
 		//no changes
 		if string(patch.Patch) == "{}" || len(patch.Patch) == 0 {
-			allErrs = append(allErrs, fmt.Errorf("info: %s was not changed\n", name))
 			continue
 		}
 
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject.go
@@ -247,7 +247,6 @@ func (o *SubjectOptions) Run(fn updateSubjects) error {
 
 		//no changes
 		if string(patch.Patch) == "{}" || len(patch.Patch) == 0 {
-			allErrs = append(allErrs, fmt.Errorf("info: %s was not changed\n", name))
 			continue
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,6 @@ func (o *SetResourcesOptions) Run() error {`
`267`	`267`
`268`	`268`	`//no changes`
`269`	`269`	`if string(patch.Patch) == "{}" \|\| len(patch.Patch) == 0 {`
`270`		`- allErrs = append(allErrs, fmt.Errorf("info: %s was not changed\n", name))`
`271`	`270`	`continue`
`272`	`271`	`}`
`273`	`272`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,6 @@ func (o *SubjectOptions) Run(fn updateSubjects) error {`
`247`	`247`
`248`	`248`	`//no changes`
`249`	`249`	`if string(patch.Patch) == "{}" \|\| len(patch.Patch) == 0 {`
`250`		`- allErrs = append(allErrs, fmt.Errorf("info: %s was not changed\n", name))`
`251`	`250`	`continue`
`252`	`251`	`}`
`253`	`252`