Merge pull request #85490 from sallyom/set-resources-no-error-no-change
don't error if set-resources patch is empty Kubernetes-commit: 7c87b5fb55ca096c007c8739d4657a5a4e29fb09
This commit is contained in:
commit
ae86c4ed25
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue