Skip to content

Commit 3bb9979

Browse files
author
Paulo Gomes
authored
Merge pull request #538 from pjbgf/update-deps
Update dependencies
2 parents 17d1b89 + 16cf566 commit 3bb9979

File tree

4 files changed

+106
-212
lines changed

4 files changed

+106
-212
lines changed

‎api/go.mod

+5-8
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ module github.com/fluxcd/helm-controller/api
33
go 1.18
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v0.5.0
7-
github.com/fluxcd/pkg/apis/meta v0.15.0
8-
k8s.io/apiextensions-apiserver v0.25.0
9-
k8s.io/apimachinery v0.25.0
10-
sigs.k8s.io/controller-runtime v0.12.3
6+
github.com/fluxcd/pkg/apis/kustomize v0.6.0
7+
github.com/fluxcd/pkg/apis/meta v0.16.0
8+
k8s.io/apiextensions-apiserver v0.25.2
9+
k8s.io/apimachinery v0.25.2
10+
sigs.k8s.io/controller-runtime v0.13.0
1111
)
1212

13-
// Fix CVE-2022-28948
14-
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
15-
1613
require (
1714
github.com/go-logr/logr v1.2.3 // indirect
1815
github.com/gogo/protobuf v1.3.2 // indirect

‎api/go.sum

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/fluxcd/pkg/apis/kustomize v0.5.0 h1:4Rvr4zWQV2KyHkSQzq8IFPo10b0UVAGEgVaXByrGlNw=
5-
github.com/fluxcd/pkg/apis/kustomize v0.5.0/go.mod h1:N3Rtc5wDm/omHH0YHUbILyUpRNmWvZGejb5/8Uyk6II=
6-
github.com/fluxcd/pkg/apis/meta v0.15.0 h1:uDVzbDNdFjp0GSB9qMpcW6r4K7SAjBQlCxQENSkWgkQ=
7-
github.com/fluxcd/pkg/apis/meta v0.15.0/go.mod h1:7NkgFrlswnx2QxP16+8zVNDBf+VhZ7PsDhkcJY6OSgQ=
8-
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
4+
github.com/fluxcd/pkg/apis/kustomize v0.6.0 h1:Afxv3Uv+xiuettzqm3sP0ceWikDZTfHdHtLv6u2nFM8=
5+
github.com/fluxcd/pkg/apis/kustomize v0.6.0/go.mod h1:iY0zSpK6eUiPfNt/yR6g0q/wQP+wH+Ax/L7KBOx5x2M=
6+
github.com/fluxcd/pkg/apis/meta v0.16.0 h1:6Mj9rB0TtvCeTe3IlQDc1i2DH75Oosea9yUqS7XafVg=
7+
github.com/fluxcd/pkg/apis/meta v0.16.0/go.mod h1:GrOVzWXiu22XjLNgLLe2EBYhQPqZetes5SIADb4bmHE=
8+
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
99
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
1010
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
1111
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
1212
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
1313
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1414
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
15-
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
15+
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
1616
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1717
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
1818
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -32,7 +32,7 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
3232
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
3333
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
3434
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
35-
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
35+
github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
3636
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3737
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3838
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
@@ -71,7 +71,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
7171
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7272
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7373
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
74-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
7574
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7675
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7776
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -83,18 +82,18 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
8382
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
8483
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
8584
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
86-
k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0=
87-
k8s.io/apiextensions-apiserver v0.25.0 h1:CJ9zlyXAbq0FIW8CD7HHyozCMBpDSiH7EdrSTCZcZFY=
88-
k8s.io/apiextensions-apiserver v0.25.0/go.mod h1:3pAjZiN4zw7R8aZC5gR0y3/vCkGlAjCazcg1me8iB/E=
89-
k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU=
90-
k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0=
85+
k8s.io/api v0.25.2 h1:v6G8RyFcwf0HR5jQGIAYlvtRNrxMJQG1xJzaSeVnIS8=
86+
k8s.io/apiextensions-apiserver v0.25.2 h1:8uOQX17RE7XL02ngtnh3TgifY7EhekpK+/piwzQNnBo=
87+
k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8=
88+
k8s.io/apimachinery v0.25.2 h1:WbxfAjCx+AeN8Ilp9joWnyJ6xu9OMeS/fsfjK/5zaQs=
89+
k8s.io/apimachinery v0.25.2/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA=
9190
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
9291
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
9392
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
9493
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
9594
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
96-
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
97-
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
95+
sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRMc2WIQ=
96+
sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
9897
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
9998
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
10099
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎go.mod

+27-29
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ replace github.com/fluxcd/helm-controller/api => ./api
77
require (
88
github.com/fluxcd/helm-controller/api v0.24.0
99
github.com/fluxcd/pkg/apis/acl v0.1.0
10-
github.com/fluxcd/pkg/apis/kustomize v0.5.0
11-
github.com/fluxcd/pkg/apis/meta v0.15.0
12-
github.com/fluxcd/pkg/runtime v0.18.0
13-
github.com/fluxcd/source-controller/api v0.29.0
10+
github.com/fluxcd/pkg/apis/kustomize v0.6.0
11+
github.com/fluxcd/pkg/apis/meta v0.16.0
12+
github.com/fluxcd/pkg/runtime v0.19.0
13+
github.com/fluxcd/source-controller/api v0.30.0
1414
github.com/go-logr/logr v1.2.3
1515
github.com/hashicorp/go-retryablehttp v0.7.1
1616
github.com/onsi/gomega v1.20.2
1717
github.com/spf13/pflag v1.0.5
18-
helm.sh/helm/v3 v3.9.4
19-
k8s.io/api v0.25.0
20-
k8s.io/apiextensions-apiserver v0.25.0
21-
k8s.io/apimachinery v0.25.0
22-
k8s.io/cli-runtime v0.25.0
23-
k8s.io/client-go v0.25.0
24-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
25-
sigs.k8s.io/controller-runtime v0.12.3
18+
helm.sh/helm/v3 v3.10.0
19+
k8s.io/api v0.25.2
20+
k8s.io/apiextensions-apiserver v0.25.2
21+
k8s.io/apimachinery v0.25.2
22+
k8s.io/cli-runtime v0.25.2
23+
k8s.io/client-go v0.25.2
24+
k8s.io/utils v0.0.0-20220922133306-665eaaec4324
25+
sigs.k8s.io/controller-runtime v0.13.0
2626
sigs.k8s.io/kustomize/api v0.12.1
2727
sigs.k8s.io/yaml v1.3.0
2828
)
@@ -36,14 +36,11 @@ replace (
3636
// Fix CVE-2022-1996 (for v2, Go Modules incompatible)
3737
replace github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
3838

39-
// Fix CVE-2022-28948
40-
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
41-
4239
require (
4340
cloud.google.com/go v0.99.0 // indirect
4441
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
45-
github.com/BurntSushi/toml v1.0.0 // indirect
46-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
42+
github.com/BurntSushi/toml v1.1.0 // indirect
43+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4744
github.com/Masterminds/goutils v1.1.1 // indirect
4845
github.com/Masterminds/semver/v3 v3.1.1 // indirect
4946
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
@@ -53,7 +50,7 @@ require (
5350
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
5451
github.com/beorn7/perks v1.0.1 // indirect
5552
github.com/cespare/xxhash/v2 v2.1.2 // indirect
56-
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
53+
github.com/chai2010/gettext-go v1.0.2 // indirect
5754
github.com/containerd/containerd v1.6.6 // indirect
5855
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
5956
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -65,10 +62,11 @@ require (
6562
github.com/docker/go-metrics v0.0.1 // indirect
6663
github.com/docker/go-units v0.4.0 // indirect
6764
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
68-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
65+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
66+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
6967
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
7068
github.com/fatih/color v1.13.0 // indirect
71-
github.com/fsnotify/fsnotify v1.5.1 // indirect
69+
github.com/fsnotify/fsnotify v1.5.4 // indirect
7270
github.com/go-errors/errors v1.0.1 // indirect
7371
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
7472
github.com/go-logr/zapr v1.2.3 // indirect
@@ -81,7 +79,7 @@ require (
8179
github.com/golang/protobuf v1.5.2 // indirect
8280
github.com/google/btree v1.0.1 // indirect
8381
github.com/google/gnostic v0.5.7-v3refs // indirect
84-
github.com/google/go-cmp v0.5.8 // indirect
82+
github.com/google/go-cmp v0.5.9 // indirect
8583
github.com/google/gofuzz v1.2.0 // indirect
8684
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8785
github.com/google/uuid v1.3.0 // indirect
@@ -124,12 +122,12 @@ require (
124122
github.com/prometheus/client_model v0.2.0 // indirect
125123
github.com/prometheus/common v0.37.0 // indirect
126124
github.com/prometheus/procfs v0.8.0 // indirect
127-
github.com/rubenv/sql-migrate v1.1.1 // indirect
125+
github.com/rubenv/sql-migrate v1.1.2 // indirect
128126
github.com/russross/blackfriday v1.5.2 // indirect
129127
github.com/shopspring/decimal v1.2.0 // indirect
130128
github.com/sirupsen/logrus v1.8.1 // indirect
131129
github.com/spf13/cast v1.4.1 // indirect
132-
github.com/spf13/cobra v1.4.0 // indirect
130+
github.com/spf13/cobra v1.5.0 // indirect
133131
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
134132
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
135133
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -145,7 +143,7 @@ require (
145143
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
146144
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
147145
golang.org/x/text v0.3.7 // indirect
148-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
146+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
149147
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
150148
google.golang.org/appengine v1.6.7 // indirect
151149
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
@@ -154,13 +152,13 @@ require (
154152
gopkg.in/inf.v0 v0.9.1 // indirect
155153
gopkg.in/yaml.v2 v2.4.0 // indirect
156154
gopkg.in/yaml.v3 v3.0.1 // indirect
157-
k8s.io/apiserver v0.25.0 // indirect
158-
k8s.io/component-base v0.25.0 // indirect
159-
k8s.io/klog/v2 v2.70.1 // indirect
155+
k8s.io/apiserver v0.25.2 // indirect
156+
k8s.io/component-base v0.25.2 // indirect
157+
k8s.io/klog/v2 v2.80.1 // indirect
160158
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
161-
k8s.io/kubectl v0.24.2 // indirect
159+
k8s.io/kubectl v0.25.0 // indirect
162160
oras.land/oras-go v1.2.0 // indirect
163-
sigs.k8s.io/cli-utils v0.32.0 // indirect
161+
sigs.k8s.io/cli-utils v0.33.0 // indirect
164162
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
165163
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
166164
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)