Skip to content

Commit 1173f6d

Browse files
committed
Add helm diff logic and starting e2e test implementation
1 parent 2432023 commit 1173f6d

File tree

12 files changed

+311
-34
lines changed

12 files changed

+311
-34
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<a href="https://cluster-api.sigs.k8s.io"><img alt="capi" src="./logos/kubernetes-cluster-logos_final-02.svg" width="160x" /></a>
22
<p>
33
<a href="https://godoc.org/sigs.k8s.io/cluster-api"><img src="https://godoc.org/sigs.k8s.io/cluster-api?status.svg"></a>
4-
<!-- join kubernetes slack channel for cluster-api -->
4+
<!-- join kubernetes Slack channel for cluster-api -->
55
<a href="http://slack.k8s.io/">
66
<img src="https://img.shields.io/badge/join%20slack-%23cluster--api-brightgreen"></a>
77
</p>

config/manager/manager.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ spec:
4646
value: /tmp/xdg/.cache
4747
- name: XDG_CONFIG_DIRS
4848
value: /tmp/xdg
49+
- name: KUBECACHEDIR
50+
value: /tmp/.kube/cache
4951
image: controller:latest
5052
imagePullPolicy: Always
5153
name: manager

controllers/helmreleasedrift/releasedrift_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ var excludeCreateEventsPredicate = predicate.Funcs{
4545
CreateFunc: func(e event.CreateEvent) bool {
4646
return false
4747
},
48+
/*
49+
UpdateFunc: func(e event.UpdateEvent) bool {
50+
return false
51+
},
52+
*/
4853
}
4954

5055
// setupWithManager sets up the controller with the Manager.

go.mod

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ toolchain go1.22.10
66

77
require (
88
github.com/Masterminds/sprig/v3 v3.3.0
9+
github.com/databus23/helm-diff/v3 v3.0.0-00010101000000-000000000000
910
github.com/google/go-cmp v0.6.0
1011
github.com/ironcore-dev/controller-utils v0.9.4
1112
github.com/onsi/ginkgo/v2 v2.22.2
@@ -45,6 +46,7 @@ require (
4546
github.com/adrg/xdg v0.5.3 // indirect
4647
github.com/alessio/shellescape v1.4.2 // indirect
4748
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
49+
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a // indirect
4850
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4951
github.com/beorn7/perks v1.0.1 // indirect
5052
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -66,7 +68,7 @@ require (
6668
github.com/docker/go-units v0.5.0 // indirect
6769
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
6870
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
69-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
71+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
7072
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
7173
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
7274
github.com/fatih/color v1.18.0 // indirect
@@ -87,6 +89,12 @@ require (
8789
github.com/gogo/protobuf v1.3.2 // indirect
8890
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8991
github.com/golang/protobuf v1.5.4 // indirect
92+
github.com/gonvenience/bunt v1.3.5 // indirect
93+
github.com/gonvenience/neat v1.3.13 // indirect
94+
github.com/gonvenience/term v1.0.2 // indirect
95+
github.com/gonvenience/text v1.0.7 // indirect
96+
github.com/gonvenience/wrap v1.2.0 // indirect
97+
github.com/gonvenience/ytbx v1.4.4 // indirect
9098
github.com/google/btree v1.0.1 // indirect
9199
github.com/google/cel-go v0.20.1 // indirect
92100
github.com/google/gnostic-models v0.6.8 // indirect
@@ -105,6 +113,7 @@ require (
105113
github.com/hashicorp/errwrap v1.1.0 // indirect
106114
github.com/hashicorp/go-multierror v1.1.1 // indirect
107115
github.com/hashicorp/hcl v1.0.0 // indirect
116+
github.com/homeport/dyff v1.9.0 // indirect
108117
github.com/huandu/xstrings v1.5.0 // indirect
109118
github.com/imdario/mergo v0.3.13 // indirect
110119
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -116,13 +125,18 @@ require (
116125
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
117126
github.com/lib/pq v1.10.9 // indirect
118127
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
128+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
119129
github.com/magiconair/properties v1.8.8 // indirect
120130
github.com/mailru/easyjson v0.7.7 // indirect
131+
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
121132
github.com/mattn/go-colorable v0.1.13 // indirect
122133
github.com/mattn/go-isatty v0.0.20 // indirect
123134
github.com/mattn/go-runewidth v0.0.14 // indirect
135+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
124136
github.com/mitchellh/copystructure v1.2.0 // indirect
137+
github.com/mitchellh/go-ps v1.0.0 // indirect
125138
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
139+
github.com/mitchellh/hashstructure v1.1.0 // indirect
126140
github.com/mitchellh/mapstructure v1.5.0 // indirect
127141
github.com/mitchellh/reflectwalk v1.0.2 // indirect
128142
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -148,6 +162,7 @@ require (
148162
github.com/russross/blackfriday/v2 v2.1.0 // indirect
149163
github.com/sagikazarmark/locafero v0.4.0 // indirect
150164
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
165+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
151166
github.com/shopspring/decimal v1.4.0 // indirect
152167
github.com/sirupsen/logrus v1.9.3 // indirect
153168
github.com/sourcegraph/conc v0.3.0 // indirect
@@ -157,7 +172,9 @@ require (
157172
github.com/spf13/viper v1.19.0 // indirect
158173
github.com/stoewer/go-strcase v1.2.0 // indirect
159174
github.com/subosito/gotenv v1.6.0 // indirect
175+
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
160176
github.com/valyala/fastjson v1.6.4 // indirect
177+
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
161178
github.com/x448/float16 v0.8.4 // indirect
162179
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
163180
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -207,4 +224,7 @@ require (
207224
sigs.k8s.io/yaml v1.4.0 // indirect
208225
)
209226

210-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.3
227+
replace (
228+
github.com/databus23/helm-diff/v3 => github.com/dmvolod/helm-diff/v3 v3.9.10-fix.2
229+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.3
230+
)

0 commit comments

Comments
 (0)