Merge pull request #21723 from caesarxuchao/log-in-patch

Adding an apiserver log entry when Patch fails because of a meaningful conflict

pkg/apiserver/resthandler.go

@@ -589,6 +589,7 @@ func patchResource(ctx api.Context, admit updateAdmissionFunc, timeout time.Dura
 				return nil, err
 			}
 			if hasConflicts {
+				glog.V(4).Infof("patchResource failed for resource %s, becauase there is a meaningful conflict.\n diff1=%v\n, diff2=%v\n", name, diff1, diff2)
 				return updateObject, updateErr
 			}