github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Replaced klog with an error wrapper

Browse Source
This commit is contained in:
Josh Samuels 2019-06-12 23:15:13 -07:00
parent 4b29036db9
commit 62b8b1702c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/apply/apply.go
View File

@ -398,7 +398,7 @@ func (o *ApplyOptions) Run() error {
if err != nil {
return cmdutil.AddSourceToErr("serverside-apply", info.Source, err)
}
options := metav1.PatchOptions{
Force: &o.ForceConflicts,
FieldManager: o.FieldManager,
@ -416,7 +416,7 @@ func (o *ApplyOptions) Run() error {
)
if err != nil {
if isIncompatibleServerError(err) {
klog.Warningf("serverside-apply incompatible server: %v", err)
err = fmt.Errorf("Server-side apply not available on the server: (%v)", err)
}
return err