Skip to content

Commit 485a749

Browse files
authored
Merge pull request #303 from fidelity/update-fluxcd
feat: integrate helm-controller v0.22.0
2 parents 94baf74 + 22531b9 commit 485a749

File tree

6 files changed

+123
-63
lines changed

6 files changed

+123
-63
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.3.16
1+
v0.3.17

chart/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
description: A Helm chart for kraan controller
33
name: kraan-controller
44
type: application
5-
appVersion: v0.3.16
6-
version: v0.3.16
5+
appVersion: v0.3.17
6+
version: v0.3.17

chart/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ gotk:
157157
image:
158158
repository: ghcr.io/fluxcd
159159
name: helm-controller
160-
tag: v0.21.0
160+
tag: v0.22.0
161161
imagePullPolicy:
162162

163163
proxy: true

go.mod

+33-24
Original file line numberDiff line numberDiff line change
@@ -3,71 +3,80 @@ module github.com/fidelity/kraan
33
go 1.17
44

55
require (
6-
github.com/fluxcd/helm-controller/api v0.21.0
7-
github.com/fluxcd/pkg/apis/meta v0.13.0
6+
github.com/fluxcd/helm-controller/api v0.22.0
7+
github.com/fluxcd/pkg/apis/meta v0.14.1
88
github.com/fluxcd/pkg/untar v0.1.0
99
github.com/fluxcd/source-controller/api v0.24.4
10-
github.com/go-logr/logr v1.2.2
10+
github.com/go-logr/logr v1.2.3
1111
github.com/golang/mock v1.6.0
1212
github.com/google/go-cmp v0.5.6
1313
github.com/paulcarlton-ww/goutils/pkg/testutils v0.1.42
1414
github.com/pkg/errors v0.9.1
15-
github.com/prometheus/client_golang v1.11.0
16-
go.uber.org/zap v1.20.0
17-
golang.org/x/mod v0.4.2
18-
k8s.io/api v0.23.6
19-
k8s.io/apiextensions-apiserver v0.23.6
20-
k8s.io/apimachinery v0.23.6
21-
k8s.io/client-go v0.23.6
15+
github.com/prometheus/client_golang v1.12.1
16+
go.uber.org/zap v1.21.0
17+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
18+
k8s.io/api v0.24.1
19+
k8s.io/apiextensions-apiserver v0.24.1
20+
k8s.io/apimachinery v0.24.1
21+
k8s.io/client-go v0.24.1
2222
sigs.k8s.io/controller-runtime v0.11.2
2323
)
2424

2525
require (
26+
github.com/PuerkitoBio/purell v1.1.1 // indirect
27+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2628
github.com/beorn7/perks v1.0.1 // indirect
27-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2830
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
2932
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3033
github.com/fluxcd/pkg/apis/acl v0.0.3 // indirect
31-
github.com/fluxcd/pkg/apis/kustomize v0.3.3 // indirect
34+
github.com/fluxcd/pkg/apis/kustomize v0.4.1 // indirect
3235
github.com/fsnotify/fsnotify v1.5.1 // indirect
3336
github.com/go-logr/zapr v1.2.0 // indirect
37+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
38+
github.com/go-openapi/jsonreference v0.19.5 // indirect
39+
github.com/go-openapi/swag v0.19.14 // indirect
3440
github.com/gogo/protobuf v1.3.2 // indirect
3541
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3642
github.com/golang/protobuf v1.5.2 // indirect
43+
github.com/google/gnostic v0.5.7-v3refs // indirect
3744
github.com/google/gofuzz v1.2.0 // indirect
3845
github.com/google/uuid v1.1.2 // indirect
39-
github.com/googleapis/gnostic v0.5.5 // indirect
4046
github.com/imdario/mergo v0.3.12 // indirect
47+
github.com/josharian/intern v1.0.0 // indirect
4148
github.com/json-iterator/go v1.1.12 // indirect
4249
github.com/kr/pretty v0.2.1 // indirect
4350
github.com/kylelemons/godebug v1.1.0 // indirect
51+
github.com/mailru/easyjson v0.7.6 // indirect
4452
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
4553
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4654
github.com/modern-go/reflect2 v1.0.2 // indirect
55+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4756
github.com/onsi/gomega v1.18.1 // indirect
4857
github.com/paulcarlton-ww/goutils/pkg/logging v0.0.3 // indirect
4958
github.com/prometheus/client_model v0.2.0 // indirect
50-
github.com/prometheus/common v0.28.0 // indirect
51-
github.com/prometheus/procfs v0.6.0 // indirect
59+
github.com/prometheus/common v0.32.1 // indirect
60+
github.com/prometheus/procfs v0.7.3 // indirect
5261
github.com/spf13/pflag v1.0.5 // indirect
5362
go.uber.org/atomic v1.7.0 // indirect
5463
go.uber.org/multierr v1.6.0 // indirect
55-
golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 // indirect
56-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
57-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
58-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
64+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
65+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
66+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
67+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
5968
golang.org/x/text v0.3.7 // indirect
60-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
69+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
6170
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6271
google.golang.org/appengine v1.6.7 // indirect
6372
google.golang.org/protobuf v1.27.1 // indirect
6473
gopkg.in/inf.v0 v0.9.1 // indirect
6574
gopkg.in/yaml.v2 v2.4.0 // indirect
6675
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
67-
k8s.io/component-base v0.23.6 // indirect
68-
k8s.io/klog/v2 v2.30.0 // indirect
69-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
70-
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
76+
k8s.io/component-base v0.24.1 // indirect
77+
k8s.io/klog/v2 v2.60.1 // indirect
78+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
79+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
7180
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
7281
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
7382
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)