From 4f13f2739a3a33c7ed4b86b98054972c0fde4579 Mon Sep 17 00:00:00 2001 From: louisgong Date: Sat, 9 Nov 2019 20:34:51 +0800 Subject: [PATCH] fix kubectl diff panic --- staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index 9c679a0024a..8e2427d9773 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -257,6 +257,7 @@ type InfoObject struct { Force bool ServerSideApply bool ForceConflicts bool + genericclioptions.IOStreams } var _ Object = &InfoObject{} @@ -325,7 +326,7 @@ func (obj InfoObject) Merged() (runtime.Object, error) { ResourceVersion: resourceVersion, } - _, result, err := patcher.Patch(obj.Info.Object, modified, obj.Info.Source, obj.Info.Namespace, obj.Info.Name, nil) + _, result, err := patcher.Patch(obj.Info.Object, modified, obj.Info.Source, obj.Info.Namespace, obj.Info.Name, obj.ErrOut) return result, err } @@ -492,6 +493,7 @@ func (o *DiffOptions) Run() error { Force: force, ServerSideApply: o.ServerSideApply, ForceConflicts: o.ForceConflicts, + IOStreams: o.Diff.IOStreams, } err = differ.Diff(obj, printer)