From decab8ea2e6ea4b31560aff50abb2676a67ec8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=98=8E=E5=90=8C=E5=AD=A6?=
 <11614773+liuming-dev@users.noreply.github.com>
Date: Thu, 14 May 2020 05:53:37 +0800
Subject: [PATCH] fix: upgrade using --force shoud not run patch logic (#8000)

fix helm/helm#7999

Signed-off-by: Liu Ming <hit_oak_tree@126.com>
---
 pkg/kube/client.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index c1de2b299..4683d8033 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -418,29 +418,29 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
 		kind   = target.Mapping.GroupVersionKind.Kind
 	)
 
-	patch, patchType, err := createPatch(target, currentObj)
-	if err != nil {
-		return errors.Wrap(err, "failed to create patch")
-	}
-
-	if patch == nil || string(patch) == "{}" {
-		c.Log("Looks like there are no changes for %s %q", target.Mapping.GroupVersionKind.Kind, target.Name)
-		// This needs to happen to make sure that tiller has the latest info from the API
-		// Otherwise there will be no labels and other functions that use labels will panic
-		if err := target.Get(); err != nil {
-			return errors.Wrap(err, "failed to refresh resource information")
-		}
-		return nil
-	}
-
 	// if --force is applied, attempt to replace the existing resource with the new object.
 	if force {
+		var err error
 		obj, err = helper.Replace(target.Namespace, target.Name, true, target.Object)
 		if err != nil {
 			return errors.Wrap(err, "failed to replace object")
 		}
 		c.Log("Replaced %q with kind %s for kind %s", target.Name, currentObj.GetObjectKind().GroupVersionKind().Kind, kind)
 	} else {
+		patch, patchType, err := createPatch(target, currentObj)
+		if err != nil {
+			return errors.Wrap(err, "failed to create patch")
+		}
+
+		if patch == nil || string(patch) == "{}" {
+			c.Log("Looks like there are no changes for %s %q", target.Mapping.GroupVersionKind.Kind, target.Name)
+			// This needs to happen to make sure that tiller has the latest info from the API
+			// Otherwise there will be no labels and other functions that use labels will panic
+			if err := target.Get(); err != nil {
+				return errors.Wrap(err, "failed to refresh resource information")
+			}
+			return nil
+		}
 		// send patch to server
 		obj, err = helper.Patch(target.Namespace, target.Name, patchType, patch, nil)
 		if err != nil {