fix: issue-5041 (operator-framework#5042)

Signed-off-by: cndoit18 <[email protected]>

Author: cndoit18

internal/helm/release/manager.go

@@ -138,6 +138,14 @@ func notFoundErr(err error) bool {
 	return err != nil && strings.Contains(err.Error(), "not found")
 }
 
+func (m manager) getCandidateRelease(namespace, name string, chart *cpb.Chart,
+	values map[string]interface{}) (*rpb.Release, error) {
+	upgrade := action.NewUpgrade(m.actionConfig)
+	upgrade.Namespace = namespace
+	upgrade.DryRun = true
+	return upgrade.Run(name, chart, values)
+}
+
 // This is caused by the different logic of loading from local and loading from secret
 // For example, the Raw field, which has the tag `json:"-"`, causes the Unmarshal to be lost when it into Release
 // We need to make them follow the JSON tag
@@ -161,16 +169,20 @@ func (m manager) isUpgrade(deployedRelease *rpb.Release) (bool, error) {
 		return false, nil
 	}
 
+	candidateRelease, err := m.getCandidateRelease(m.namespace, m.releaseName, m.chart, m.values)
+	if err != nil {
+		return false, err
+	}
+
 	// Judging whether to skip updates
-	skip := m.namespace == deployedRelease.Namespace
-	skip = skip && m.releaseName == deployedRelease.Name
+	skip := candidateRelease.Namespace == deployedRelease.Namespace
+	skip = skip && candidateRelease.Name == deployedRelease.Name
 
 	ok, err := equalJSONStruct(m.chart, deployedRelease.Chart)
 	if err != nil {
 		return false, err
 	}
 	skip = skip && ok
-
 	ok, err = equalJSONStruct(m.values, deployedRelease.Config)
 	return !(skip && ok), err
 }

internal/helm/release/manager_test.go

@@ -17,12 +17,18 @@ package release
 import (
 	"bytes"
 	"encoding/json"
+	"io/ioutil"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"helm.sh/helm/v3/pkg/action"
 	cpb "helm.sh/helm/v3/pkg/chart"
 	lpb "helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/chartutil"
+	kubefake "helm.sh/helm/v3/pkg/kube/fake"
 	rpb "helm.sh/helm/v3/pkg/release"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -271,7 +277,17 @@ func TestManagerisUpgrade(t *testing.T) {
 				namespace:   test.releaseNs,
 				values:      test.values,
 				chart:       test.chart,
+				actionConfig: &action.Configuration{
+					Releases:     storage.Init(driver.NewMemory()),
+					KubeClient:   &kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: ioutil.Discard}},
+					Capabilities: chartutil.DefaultCapabilities,
+					Log:          t.Logf,
+				},
 			}
+<<<<<<< HEAD
+=======
+			assert.Equal(t, nil, m.actionConfig.Releases.Create(test.deployedRelease))
+>>>>>>> e8e6009e (fix: issue-5041 (#5042))
 			isUpgrade, err := m.isUpgrade(test.deployedRelease)
 			assert.Equal(t, test.want, isUpgrade)
 			assert.Equal(t, nil, err)
@@ -290,11 +306,15 @@ func newTestRelease(chart *cpb.Chart, values map[string]interface{}, name, names
 		Name:      name,
 		Namespace: namespace,
 		Version:   1,
+		Chart:     chart,
 	})
 
+<<<<<<< HEAD
 	buffer := &bytes.Buffer{}
 	_ = json.NewEncoder(buffer).Encode(chart)
 	_ = json.NewDecoder(buffer).Decode(release.Chart)
+=======
+>>>>>>> e8e6009e (fix: issue-5041 (#5042))
 	release.Config = values
 	return release
 }