Skip to content

Commit df83db7

Browse files
committed
fix:issue-5041
Signed-off-by: cndoit18 <[email protected]>
1 parent 2781cf8 commit df83db7

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

Diff for: changelog/fragments/helm-deepequals.yaml

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

Diff for: internal/helm/release/manager.go

+14
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,20 @@ func (m manager) isUpgrade(deployedRelease *rpb.Release) bool {
143143
// Judging whether to skip updates
144144
skip := m.namespace == deployedRelease.Namespace
145145
skip = skip && m.releaseName == deployedRelease.Name
146+
147+
_ = apiequality.Semantic.AddFunc(func(a, b *cpb.Chart) bool {
148+
if a == nil || b == nil {
149+
return a == b
150+
}
151+
aencode := &bytes.Buffer{}
152+
bencode := &bytes.Buffer{}
153+
154+
_ = json.NewEncoder(aencode).Encode(a)
155+
_ = json.NewEncoder(bencode).Encode(b)
156+
157+
return aencode.String() == bencode.String()
158+
})
159+
146160
skip = skip && apiequality.Semantic.DeepEqual(m.chart, deployedRelease.Chart)
147161
skip = skip && apiequality.Semantic.DeepEqual(m.values, deployedRelease.Config)
148162

Diff for: internal/helm/release/manager_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
package release
1616

1717
import (
18+
"bytes"
19+
"encoding/json"
1820
"testing"
1921

2022
"github.com/stretchr/testify/assert"
@@ -277,9 +279,12 @@ func newTestRelease(chart *cpb.Chart, values map[string]interface{}, name, names
277279
release := rpb.Mock(&rpb.MockReleaseOptions{
278280
Name: name,
279281
Namespace: namespace,
280-
Chart: chart,
281282
Version: 1,
282283
})
284+
285+
buffer := &bytes.Buffer{}
286+
_ = json.NewEncoder(buffer).Encode(chart)
287+
_ = json.NewDecoder(buffer).Decode(release.Chart)
283288
release.Config = values
284289
return release
285290
}

0 commit comments

Comments
 (0)