Merge pull request #29300 from janetkuo/kubectl-set-image-record-patch

Automatic merge from submit-queue Use patch when recording commands in kubectl set image 1. Use `Patch` to mitigate update conflict. See http://stackoverflow.com/questions/38476531/kubernetes-kubectl-set-image-deployment-not-able-to-record-history 2. Return warning instead of error when fail to record command @kubernetes/kubectl

Merge pull request #29300 from janetkuo/kubectl-set-image-record-patch
ba51b6b9 · k8s-merge-robot · GitHub · e2fb251c · 623a97c6 · ba51b6b9
Commit ba51b6b9 authored Jul 22, 2016 by k8s-merge-robot Committed by GitHub Jul 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

set_image.go pkg/kubectl/cmd/set/set_image.go +3 -3

No files found.
--- a/pkg/kubectl/cmd/set/set_image.go
+++ b/pkg/kubectl/cmd/set/set_image.go
@@ -212,9 +212,9 @@ func (o *ImageOptions) Run() error {

 		// record this change (for rollout history)
 		if o.Record || cmdutil.ContainsChangeCause(info) {
-			if err := cmdutil.RecordChangeCause(obj, o.ChangeCause); err == nil {
-				if obj, err = resource.NewHelper(info.Client, info.Mapping).Replace(info.Namespace, info.Name, false, obj); err != nil {
-					allErrs = append(allErrs, fmt.Errorf("changes to %s/%s can't be recorded: %v\n", info.Mapping.Resource, info.Name, err))
+			if patch, err := cmdutil.ChangeResourcePatch(info, o.ChangeCause); err == nil {
+				if obj, err = resource.NewHelper(info.Client, info.Mapping).Patch(info.Namespace, info.Name, api.StrategicMergePatchType, patch); err != nil {
+					fmt.Fprintf(o.Err, "WARNING: changes to %s/%s can't be recorded: %v\n", info.Mapping.Resource, info.Name, err)
 				}
 			}
 		}