fix:issue-5041

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

Author: cndoit18

changelog/fragments/helm-deepequals.yaml

@@ -0,0 +1,4 @@
+entries:
+  - description: >
+      For Helm-based operators, fixed a bug where getting a new helm release revision for every reconciliation, even when there are no changes at all.
+    kind: bugfix

internal/helm/release/manager.go

@@ -135,6 +135,13 @@ func notFoundErr(err error) bool {
 	return err != nil && strings.Contains(err.Error(), "not found")
 }
 
+func filter(o interface{}) (result interface{}) {
+	tmp := &bytes.Buffer{}
+	_ = json.NewEncoder(tmp).Encode(o)
+	_ = json.NewDecoder(tmp).Decode(&result)
+	return
+}
+
 func (m manager) isUpgrade(deployedRelease *rpb.Release) bool {
 	if deployedRelease == nil {
 		return false
@@ -143,8 +150,9 @@ func (m manager) isUpgrade(deployedRelease *rpb.Release) bool {
 	// Judging whether to skip updates
 	skip := m.namespace == deployedRelease.Namespace
 	skip = skip && m.releaseName == deployedRelease.Name
-	skip = skip && apiequality.Semantic.DeepEqual(m.chart, deployedRelease.Chart)
-	skip = skip && apiequality.Semantic.DeepEqual(m.values, deployedRelease.Config)
+
+	skip = skip && apiequality.Semantic.DeepEqual(filter(m.chart), filter(deployedRelease.Chart))
+	skip = skip && apiequality.Semantic.DeepEqual(m.values, mergeMaps(m.chart.Values, deployedRelease.Config))
 
 	return !skip
 }

internal/helm/release/manager_test.go

@@ -15,6 +15,8 @@
 package release
 
 import (
+	"bytes"
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -247,11 +249,20 @@ func TestManagerisUpgrade(t *testing.T) {
 			name:            "different values",
 			releaseName:     "deployed",
 			releaseNs:       "deployed-ns",
-			values:          map[string]interface{}{"key": "1"},
+			values:          map[string]interface{}{"key": "1", "int": int32(1)},
 			chart:           newTestChart(t, "./testdata/simple"),
-			deployedRelease: newTestRelease(newTestChart(t, "./testdata/simple"), map[string]interface{}{"key": ""}, "deployed", "deployed-ns"),
+			deployedRelease: newTestRelease(newTestChart(t, "./testdata/simple"), map[string]interface{}{"key": "", "int": int64(1)}, "deployed", "deployed-ns"),
 			want:            true,
 		},
+		{
+			name:            "nil values",
+			releaseName:     "deployed",
+			releaseNs:       "deployed-ns",
+			values:          nil,
+			chart:           newTestChart(t, "./testdata/simple"),
+			deployedRelease: newTestRelease(newTestChart(t, "./testdata/simple"), map[string]interface{}{}, "deployed", "deployed-ns"),
+			want:            false,
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
@@ -277,9 +288,12 @@ func newTestRelease(chart *cpb.Chart, values map[string]interface{}, name, names
 	release := rpb.Mock(&rpb.MockReleaseOptions{
 		Name:      name,
 		Namespace: namespace,
-		Chart:     chart,
 		Version:   1,
 	})
+
+	buffer := &bytes.Buffer{}
+	_ = json.NewEncoder(buffer).Encode(chart)
+	_ = json.NewDecoder(buffer).Decode(release.Chart)
 	release.Config = values
 	return release
 }