Merge pull request #54818 from apelisse/propagate-error-diff

Automatic merge from submit-queue (batch tested with PRs 54728, 54818). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. diff: Propragate errors when diffing Because of that, errors while diffing would potentially not do anything, leaving the user clueless of what was going on. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #54818 from apelisse/propagate-error-diff
127dc065 · Kubernetes Submit Queue · GitHub · 5c328676 · b916739d · 127dc065
Unverified Commit 127dc065 authored Oct 30, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

diff.go pkg/kubectl/cmd/diff.go +1 -2

No files found.
--- a/pkg/kubectl/cmd/diff.go
+++ b/pkg/kubectl/cmd/diff.go
@@ -446,9 +446,8 @@ func RunDiff(f cmdutil.Factory, diff *DiffProgram, options *DiffOptions, from, t
 			Parser:  parser,
 			Encoder: f.JSONEncoder(),
 		}
-		differ.Diff(obj, printer)
-		return nil
+		return differ.Diff(obj, printer)
 	})
 	if err != nil {
 		return err