Skip to content

Commit aac18f5

Browse files
author
Paulo Gomes
committed
Update dependencies
Dependencies updated: - cloud.google.com/go/storage to version 1.25.0. - github.com/Azure/azure-sdk-for-go/sdk/azcore to version 1.1.2. - github.com/ProtonMail/go-crypto to version 0.0.0-20220812175011-7fcef0dbe794. - github.com/distribution/distribution/v3 to version 3.0.0-20220816150328-6c237953cbbe. - github.com/fluxcd/gitkit to version 0.6.0. - github.com/fluxcd/pkg/gittestserver to version 0.6.0. - github.com/fluxcd/pkg/oci to version 0.5.1. - github.com/google/go-containerregistry to version 0.11.0. - github.com/google/go-containerregistry/pkg/authn/k8schain to version 0.0.0-20220808030257-7196cf3dc436. - github.com/minio/minio-go/v7 to version 7.0.34. - github.com/onsi/gomega to version 1.20.0. - github.com/prometheus/client_golang to version 1.13.0. - golang.org/x/crypto to version 0.0.0-20220722155217-630584e8d5aa. - golang.org/x/net to version 0.0.0-20220812174116-3211cb980234. - golang.org/x/sync to version 0.0.0-20220722155255-886fb9371eb4. - google.golang.org/api to version 0.93.0. - helm.sh/helm/v3 to version 3.9.3. - k8s.io/api to version 0.24.3. - k8s.io/apimachinery to version 0.24.3. - k8s.io/client-go to version 0.24.3. - k8s.io/utils to version 0.0.0-20220812165043-ad590609e2e5. Replace removed for gopkg.in/yaml.v3@v3.0.1 and github.com/containerd/containerd@v1.6.6, as they no longer need to be enforced. Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
1 parent a20c0b5 commit aac18f5

File tree

2 files changed

+196
-568
lines changed

2 files changed

+196
-568
lines changed

‎go.mod‎

Lines changed: 59 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@ replace github.com/fluxcd/source-controller/api => ./api
1515
replace github.com/libgit2/git2go/v33 => github.com/pjbgf/git2go/v33 v33.0.9-nothread-check
1616

1717
require (
18-
cloud.google.com/go/storage v1.23.0
19-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0
18+
cloud.google.com/go/storage v1.25.0
19+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2
2020
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0
2121
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
2222
github.com/Masterminds/semver/v3 v3.1.1
2323
// github.com/ProtonMail/go-crypto is a fork of golang.org/x/crypto
2424
// maintained by the ProtonMail team to continue to support the openpgp
2525
// module, after the Go team decided to no longer maintain it.
2626
// When in doubt (and not using openpgp), use /x/crypto.
27-
github.com/ProtonMail/go-crypto v0.0.0-20220623141421-5afb4c282135
27+
github.com/ProtonMail/go-crypto v0.0.0-20220812175011-7fcef0dbe794
2828
github.com/cyphar/filepath-securejoin v0.2.3
2929
github.com/darkowlzz/controller-check v0.0.0-20220325122359-11f5827b7981
30-
github.com/distribution/distribution/v3 v3.0.0-20220729163034-26163d82560f
30+
github.com/distribution/distribution/v3 v3.0.0-20220816150328-6c237953cbbe
3131
github.com/docker/cli v20.10.17+incompatible
3232
github.com/docker/go-units v0.4.0
3333
github.com/elazarl/goproxy v0.0.0-20220529153421-8ea89ba92021
34-
github.com/fluxcd/gitkit v0.5.1
34+
github.com/fluxcd/gitkit v0.6.0
3535
github.com/fluxcd/pkg/apis/meta v0.14.2
36-
github.com/fluxcd/pkg/gittestserver v0.5.4
36+
github.com/fluxcd/pkg/gittestserver v0.6.0
3737
github.com/fluxcd/pkg/gitutil v0.1.0
3838
github.com/fluxcd/pkg/helmtestserver v0.7.4
3939
github.com/fluxcd/pkg/lockedfile v0.1.0
4040
github.com/fluxcd/pkg/masktoken v0.0.1
41-
github.com/fluxcd/pkg/oci v0.5.0
41+
github.com/fluxcd/pkg/oci v0.5.1
4242
github.com/fluxcd/pkg/runtime v0.16.2
4343
github.com/fluxcd/pkg/sourceignore v0.1.0
4444
github.com/fluxcd/pkg/ssh v0.5.0
@@ -51,46 +51,40 @@ require (
5151
github.com/go-logr/logr v1.2.3
5252
github.com/google/uuid v1.3.0
5353
github.com/libgit2/git2go/v33 v33.0.9
54-
github.com/minio/minio-go/v7 v7.0.31
55-
github.com/onsi/gomega v1.19.0
54+
github.com/minio/minio-go/v7 v7.0.34
55+
github.com/onsi/gomega v1.20.0
5656
github.com/otiai10/copy v1.7.0
5757
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
58-
github.com/prometheus/client_golang v1.12.2
58+
github.com/prometheus/client_golang v1.13.0
5959
github.com/spf13/pflag v1.0.5
60-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
61-
golang.org/x/net v0.0.0-20220708220712-1185a9018129
62-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
63-
google.golang.org/api v0.86.0
60+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
61+
golang.org/x/net v0.0.0-20220812174116-3211cb980234
62+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
63+
google.golang.org/api v0.93.0
6464
gotest.tools v2.2.0+incompatible
65-
helm.sh/helm/v3 v3.9.1
66-
k8s.io/api v0.24.2
67-
k8s.io/apimachinery v0.24.2
68-
k8s.io/client-go v0.24.2
69-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
65+
helm.sh/helm/v3 v3.9.3
66+
k8s.io/api v0.24.3
67+
k8s.io/apimachinery v0.24.3
68+
k8s.io/client-go v0.24.3
69+
k8s.io/utils v0.0.0-20220812165043-ad590609e2e5
7070
sigs.k8s.io/cli-utils v0.31.2
7171
sigs.k8s.io/controller-runtime v0.11.2
7272
sigs.k8s.io/yaml v1.3.0
7373
)
7474

7575
require (
76-
github.com/google/go-containerregistry v0.10.0
77-
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20220712174516-ddd39fb9c385
76+
github.com/google/go-containerregistry v0.11.0
77+
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20220808030257-7196cf3dc436
7878
)
7979

80-
// Fix CVE-2022-28948
81-
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
82-
8380
// Fix CVE-2022-1996 (for v2, Go Modules incompatible)
8481
replace github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
8582

86-
// Fix CVE-2022-31030
87-
replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.6
88-
8983
require (
9084
cloud.google.com/go v0.102.1 // indirect
9185
cloud.google.com/go/compute v1.7.0 // indirect
9286
cloud.google.com/go/iam v0.3.0 // indirect
93-
github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect
87+
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
9488
github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
9589
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
9690
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -112,29 +106,30 @@ require (
112106
github.com/acomagu/bufpipe v1.0.3 // indirect
113107
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
114108
github.com/aws/aws-sdk-go v1.44.53 // indirect
115-
github.com/aws/aws-sdk-go-v2 v1.16.4 // indirect
116-
github.com/aws/aws-sdk-go-v2/config v1.15.8 // indirect
117-
github.com/aws/aws-sdk-go-v2/credentials v1.12.3 // indirect
118-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
119-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
120-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
121-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 // indirect
122-
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.5 // indirect
123-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.5 // indirect
124-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
125-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.6 // indirect
126-
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
127-
github.com/aws/smithy-go v1.11.2 // indirect
128-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04 // indirect
109+
github.com/aws/aws-sdk-go-v2 v1.16.7 // indirect
110+
github.com/aws/aws-sdk-go-v2/config v1.15.14 // indirect
111+
github.com/aws/aws-sdk-go-v2/credentials v1.12.9 // indirect
112+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.8 // indirect
113+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14 // indirect
114+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.8 // indirect
115+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.15 // indirect
116+
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.8 // indirect
117+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.8 // indirect
118+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.8 // indirect
119+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.12 // indirect
120+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 // indirect
121+
github.com/aws/smithy-go v1.12.0 // indirect
122+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220706184558-ce46abcd012b // indirect
129123
github.com/beorn7/perks v1.0.1 // indirect
130124
github.com/bshuster-repo/logrus-logstash-hook v1.0.2 // indirect
131125
github.com/bugsnag/bugsnag-go v2.1.2+incompatible // indirect
132126
github.com/bugsnag/panicwrap v1.3.4 // indirect
133127
github.com/cespare/xxhash/v2 v2.1.2 // indirect
134128
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
135129
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08 // indirect
130+
github.com/cloudflare/circl v1.1.0 // indirect
136131
github.com/containerd/containerd v1.6.6 // indirect
137-
github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect
132+
github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect
138133
github.com/davecgh/go-spew v1.1.1 // indirect
139134
github.com/dimchansky/utfbom v1.1.1 // indirect
140135
github.com/docker/distribution v2.8.1+incompatible // indirect
@@ -145,7 +140,7 @@ require (
145140
github.com/docker/go-metrics v0.0.1 // indirect
146141
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
147142
github.com/dustin/go-humanize v1.0.0 // indirect
148-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
143+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
149144
github.com/emirpasic/gods v1.18.1 // indirect
150145
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
151146
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
@@ -164,19 +159,18 @@ require (
164159
github.com/gofrs/uuid v4.2.0+incompatible // indirect
165160
github.com/gogo/protobuf v1.3.2 // indirect
166161
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
167-
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
162+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
168163
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
169164
github.com/golang/protobuf v1.5.2 // indirect
170165
github.com/gomodule/redigo v1.8.2 // indirect
171166
github.com/google/btree v1.0.1 // indirect
172167
github.com/google/gnostic v0.6.9 // indirect
173168
github.com/google/go-cmp v0.5.8 // indirect
174-
github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20220523143934-b17c48b086b7 // indirect
169+
github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20220719135131-f79ec2192282 // indirect
175170
github.com/google/gofuzz v1.2.0 // indirect
176171
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
177172
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
178173
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
179-
github.com/googleapis/go-type-adapters v1.0.0 // indirect
180174
github.com/gorilla/handlers v1.5.1 // indirect
181175
github.com/gorilla/mux v1.8.0 // indirect
182176
github.com/gosuri/uitable v0.0.4 // indirect
@@ -193,8 +187,8 @@ require (
193187
github.com/json-iterator/go v1.1.12 // indirect
194188
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
195189
github.com/kevinburke/ssh_config v1.2.0 // indirect
196-
github.com/klauspost/compress v1.15.4 // indirect
197-
github.com/klauspost/cpuid v1.3.1 // indirect
190+
github.com/klauspost/compress v1.15.9 // indirect
191+
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
198192
github.com/kylelemons/godebug v1.1.0 // indirect
199193
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
200194
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -205,8 +199,8 @@ require (
205199
github.com/mattn/go-isatty v0.0.14 // indirect
206200
github.com/mattn/go-runewidth v0.0.9 // indirect
207201
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
208-
github.com/minio/md5-simd v1.1.0 // indirect
209-
github.com/minio/sha256-simd v0.1.1 // indirect
202+
github.com/minio/md5-simd v1.1.2 // indirect
203+
github.com/minio/sha256-simd v1.0.0 // indirect
210204
github.com/mitchellh/copystructure v1.2.0 // indirect
211205
github.com/mitchellh/go-homedir v1.1.0 // indirect
212206
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
@@ -220,23 +214,23 @@ require (
220214
github.com/morikuni/aec v1.0.0 // indirect
221215
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
222216
github.com/opencontainers/go-digest v1.0.0 // indirect
223-
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
217+
github.com/opencontainers/image-spec v1.0.3-0.20220729202839-6ad7100eb087 // indirect
224218
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
225219
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
226220
github.com/pkg/errors v0.9.1 // indirect
227221
github.com/pmezard/go-difflib v1.0.0 // indirect
228222
github.com/prometheus/client_model v0.2.0 // indirect
229-
github.com/prometheus/common v0.32.1 // indirect
230-
github.com/prometheus/procfs v0.7.3 // indirect
231-
github.com/rs/xid v1.2.1 // indirect
223+
github.com/prometheus/common v0.37.0 // indirect
224+
github.com/prometheus/procfs v0.8.0 // indirect
225+
github.com/rs/xid v1.4.0 // indirect
232226
github.com/rubenv/sql-migrate v1.1.2 // indirect
233227
github.com/russross/blackfriday v1.6.0 // indirect
234228
github.com/sergi/go-diff v1.2.0 // indirect
235229
github.com/shopspring/decimal v1.2.0 // indirect
236230
github.com/sirupsen/logrus v1.9.0 // indirect
237231
github.com/spf13/cast v1.4.1 // indirect
238232
github.com/spf13/cobra v1.5.0 // indirect
239-
github.com/stretchr/testify v1.7.4 // indirect
233+
github.com/stretchr/testify v1.8.0 // indirect
240234
github.com/vbatts/tar-split v0.11.2 // indirect
241235
github.com/xanzy/ssh-agent v0.3.1 // indirect
242236
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
@@ -252,30 +246,30 @@ require (
252246
go.uber.org/multierr v1.6.0 // indirect
253247
go.uber.org/zap v1.21.0 // indirect
254248
golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
255-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
249+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
256250
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
257251
golang.org/x/text v0.3.7 // indirect
258-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
252+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
259253
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
260254
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
261255
google.golang.org/appengine v1.6.7 // indirect
262-
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect
263-
google.golang.org/grpc v1.47.0 // indirect
264-
google.golang.org/protobuf v1.28.0 // indirect
256+
google.golang.org/genproto v0.0.0-20220720214146-176da50484ac // indirect
257+
google.golang.org/grpc v1.48.0 // indirect
258+
google.golang.org/protobuf v1.28.1 // indirect
265259
gopkg.in/inf.v0 v0.9.1 // indirect
266-
gopkg.in/ini.v1 v1.66.2 // indirect
260+
gopkg.in/ini.v1 v1.66.6 // indirect
267261
gopkg.in/warnings.v0 v0.1.2 // indirect
268262
gopkg.in/yaml.v2 v2.4.0 // indirect
269263
gopkg.in/yaml.v3 v3.0.1 // indirect
270264
k8s.io/apiextensions-apiserver v0.24.2 // indirect
271265
k8s.io/apiserver v0.24.2 // indirect
272266
k8s.io/cli-runtime v0.24.2 // indirect
273267
k8s.io/component-base v0.24.2 // indirect
274-
k8s.io/klog/v2 v2.60.1 // indirect
275-
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
268+
k8s.io/klog/v2 v2.70.1 // indirect
269+
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
276270
k8s.io/kubectl v0.24.2 // indirect
277271
oras.land/oras-go v1.2.0 // indirect
278-
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
272+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
279273
sigs.k8s.io/kustomize/api v0.11.4 // indirect
280274
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
281275
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect

0 commit comments

Comments
 (0)