github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85035 from gongguan/fix_diff_panic

Browse Source 
fix kubectl diff panic
This commit is contained in:
Kubernetes Prow Robot 2019-11-11 12:56:18 -08:00 committed by GitHub
commit f610133f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go
View File

@ -257,6 +257,7 @@ type InfoObject struct {
Force bool Force bool
ServerSideApply bool ServerSideApply bool
ForceConflicts bool ForceConflicts bool
genericclioptions.IOStreams
} }
var _ Object = &InfoObject{} var _ Object = &InfoObject{}
@ -325,7 +326,7 @@ func (obj InfoObject) Merged() (runtime.Object, error) {
ResourceVersion: resourceVersion, 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 return result, err
} }
@ -492,6 +493,7 @@ func (o *DiffOptions) Run() error {
Force: force, Force: force,
ServerSideApply: o.ServerSideApply, ServerSideApply: o.ServerSideApply,
ForceConflicts: o.ForceConflicts, ForceConflicts: o.ForceConflicts,
IOStreams: o.Diff.IOStreams,
} }
err = differ.Diff(obj, printer) err = differ.Diff(obj, printer)