Skip to content

Commit 9bbcd09

Browse files
hiddecohiddeco
authored
Merge pull request #616 from fluxcd/dep-updates
2 parents a4d6bbc + aa40a3a commit 9bbcd09

File tree

5 files changed

+152
-113
lines changed

5 files changed

+152
-113
lines changed

‎api/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.17
44

55
require (
66
github.com/fluxcd/pkg/apis/acl v0.0.3
7-
github.com/fluxcd/pkg/apis/meta v0.12.0
8-
k8s.io/apimachinery v0.23.2
9-
sigs.k8s.io/controller-runtime v0.11.0
7+
github.com/fluxcd/pkg/apis/meta v0.12.1
8+
k8s.io/apimachinery v0.23.4
9+
sigs.k8s.io/controller-runtime v0.11.1
1010
)
1111

1212
require (

‎api/go.sum

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
123123
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
124124
github.com/fluxcd/pkg/apis/acl v0.0.3 h1:Lw0ZHdpnO4G7Zy9KjrzwwBmDZQuy4qEjaU/RvA6k1lc=
125125
github.com/fluxcd/pkg/apis/acl v0.0.3/go.mod h1:XPts6lRJ9C9fIF9xVWofmQwftvhY25n1ps7W9xw0XLU=
126-
github.com/fluxcd/pkg/apis/meta v0.12.0 h1:Ssyltj6E9A7y32sZrzjog0m+bIsFM/3lHHfmpxesUAU=
127-
github.com/fluxcd/pkg/apis/meta v0.12.0/go.mod h1:SPrSWMwDK7Ls2/4GadzhjDjPFbKrzzgzuZ0oDO3jzso=
126+
github.com/fluxcd/pkg/apis/meta v0.12.1 h1:m5PfKAqbqWBvGp9+JRj1sv+xNkGsHwUVf+3rJ8wm6SE=
127+
github.com/fluxcd/pkg/apis/meta v0.12.1/go.mod h1:f8YVt70/KAhqzZ7xxhjvqyzKubOYx2pAbakb/FfCEg8=
128128
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
129129
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
130130
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -897,8 +897,8 @@ k8s.io/api v0.23.0 h1:WrL1gb73VSC8obi8cuYETJGXEoFNEh3LU0Pt+Sokgro=
897897
k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg=
898898
k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4=
899899
k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
900-
k8s.io/apimachinery v0.23.2 h1:dBmjCOeYBdg2ibcQxMuUq+OopZ9fjfLIR5taP/XKeTs=
901-
k8s.io/apimachinery v0.23.2/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8=
900+
k8s.io/apimachinery v0.23.4 h1:fhnuMd/xUL3Cjfl64j5ULKZ1/J9n8NuQEgNL+WXWfdM=
901+
k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
902902
k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4=
903903
k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA=
904904
k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
@@ -911,14 +911,15 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
911911
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
912912
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
913913
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
914+
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
914915
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo=
915916
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
916917
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
917918
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
918919
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
919920
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
920-
sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ=
921-
sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
921+
sigs.k8s.io/controller-runtime v0.11.1 h1:7YIHT2QnHJArj/dk9aUkYhfqfK5cIxPOX5gPECfdZLU=
922+
sigs.k8s.io/controller-runtime v0.11.1/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=
922923
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
923924
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
924925
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=

‎go.mod

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,27 @@ go 1.17
55
replace github.com/fluxcd/source-controller/api => ./api
66

77
require (
8-
cloud.google.com/go/storage v1.16.0
9-
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1
10-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.1
8+
cloud.google.com/go/storage v1.21.0
9+
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0
10+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.2
1111
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0
1212
github.com/Masterminds/semver/v3 v3.1.1
13+
// github.com/ProtonMail/go-crypto is a fork of golang.org/x/crypto
14+
// maintained by the ProtonMail team to continue to support the openpgp
15+
// module, after the Go team decided to no longer maintain it.
16+
// When in doubt (and not using openpgp), use /x/crypto.
1317
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f
1418
github.com/cyphar/filepath-securejoin v0.2.3
1519
github.com/darkowlzz/controller-check v0.0.0-20220119215126-648356cef22c
1620
github.com/docker/go-units v0.4.0
17-
github.com/elazarl/goproxy v0.0.0-20211114080932-d06c3be7c11b
18-
github.com/fluxcd/pkg/apis/meta v0.12.0
19-
github.com/fluxcd/pkg/gittestserver v0.5.0
21+
github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac
22+
github.com/fluxcd/pkg/apis/meta v0.12.1
23+
github.com/fluxcd/pkg/gittestserver v0.5.1
2024
github.com/fluxcd/pkg/gitutil v0.1.0
21-
github.com/fluxcd/pkg/helmtestserver v0.6.0
25+
github.com/fluxcd/pkg/helmtestserver v0.7.1
2226
github.com/fluxcd/pkg/lockedfile v0.1.0
23-
github.com/fluxcd/pkg/runtime v0.13.1
24-
github.com/fluxcd/pkg/ssh v0.2.0
27+
github.com/fluxcd/pkg/runtime v0.13.2
28+
github.com/fluxcd/pkg/ssh v0.3.2
2529
github.com/fluxcd/pkg/testserver v0.2.0
2630
github.com/fluxcd/pkg/untar v0.1.0
2731
github.com/fluxcd/pkg/version v0.1.0
@@ -30,21 +34,21 @@ require (
3034
github.com/go-git/go-git/v5 v5.4.2
3135
github.com/go-logr/logr v1.2.2
3236
github.com/google/uuid v1.3.0
33-
github.com/libgit2/git2go/v33 v33.0.6
34-
github.com/minio/minio-go/v7 v7.0.15
35-
github.com/onsi/gomega v1.17.0
37+
github.com/libgit2/git2go/v33 v33.0.9
38+
github.com/minio/minio-go/v7 v7.0.23
39+
github.com/onsi/gomega v1.18.1
3640
github.com/otiai10/copy v1.7.0
3741
github.com/spf13/pflag v1.0.5
38-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
42+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
3943
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
40-
google.golang.org/api v0.62.0
44+
google.golang.org/api v0.73.0
4145
gotest.tools v2.2.0+incompatible
4246
helm.sh/helm/v3 v3.8.1
4347
k8s.io/api v0.23.4
4448
k8s.io/apimachinery v0.23.4
4549
k8s.io/client-go v0.23.4
4650
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
47-
sigs.k8s.io/cli-utils v0.28.0
51+
sigs.k8s.io/cli-utils v0.29.3
4852
sigs.k8s.io/controller-runtime v0.11.1
4953
sigs.k8s.io/yaml v1.3.0
5054
)
@@ -55,8 +59,27 @@ require (
5559
// TODO: Remove once Helm version with patch is released.
5660
replace helm.sh/helm/v3 v3.8.1 => github.com/hiddeco/helm/v3 v3.8.2-0.20220311115129-ae3ec836f6eb
5761

62+
// Fix GMS-2022-20
63+
replace github.com/docker/distribution => github.com/docker/distribution v2.8.0+incompatible
64+
65+
// Fix CVE-2021-30465
66+
// Fix CVE-2021-43784
67+
// Fix CVE-2019-16884
68+
// Fix GO-2021-0085
69+
// Fix GO-2021-0087
70+
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.0
71+
72+
// Fix CVE-2021-41190
73+
replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
74+
75+
// Fix CVE-2022-23648
76+
// Fix CVE-2021-43816
77+
replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.1
78+
5879
require (
59-
cloud.google.com/go v0.99.0 // indirect
80+
cloud.google.com/go v0.100.2 // indirect
81+
cloud.google.com/go/compute v1.5.0 // indirect
82+
cloud.google.com/go/iam v0.1.1 // indirect
6083
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
6184
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
6285
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
@@ -114,7 +137,7 @@ require (
114137
github.com/gosuri/uitable v0.0.4 // indirect
115138
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
116139
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
117-
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
140+
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
118141
github.com/huandu/xstrings v1.3.2 // indirect
119142
github.com/imdario/mergo v0.3.12 // indirect
120143
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -168,7 +191,7 @@ require (
168191
github.com/sosedoff/gitkit v0.3.0 // indirect
169192
github.com/spf13/cast v1.4.1 // indirect
170193
github.com/spf13/cobra v1.3.0 // indirect
171-
github.com/stretchr/testify v1.7.0 // indirect
194+
github.com/stretchr/testify v1.7.1 // indirect
172195
github.com/xanzy/ssh-agent v0.3.1 // indirect
173196
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
174197
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -181,18 +204,18 @@ require (
181204
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
182205
go.uber.org/atomic v1.7.0 // indirect
183206
go.uber.org/multierr v1.6.0 // indirect
184-
go.uber.org/zap v1.19.1 // indirect
185-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
186-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
187-
golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 // indirect
207+
go.uber.org/zap v1.21.0 // indirect
208+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
209+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
210+
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
188211
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
189212
golang.org/x/text v0.3.7 // indirect
190213
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
191214
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
192215
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
193216
google.golang.org/appengine v1.6.7 // indirect
194-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
195-
google.golang.org/grpc v1.43.0 // indirect
217+
google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect
218+
google.golang.org/grpc v1.45.0 // indirect
196219
google.golang.org/protobuf v1.27.1 // indirect
197220
gopkg.in/gorp.v1 v1.7.2 // indirect
198221
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -204,7 +227,7 @@ require (
204227
k8s.io/apiserver v0.23.4 // indirect
205228
k8s.io/cli-runtime v0.23.4 // indirect
206229
k8s.io/component-base v0.23.4 // indirect
207-
k8s.io/klog/v2 v2.40.1 // indirect
230+
k8s.io/klog/v2 v2.50.0 // indirect
208231
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
209232
k8s.io/kubectl v0.23.4 // indirect
210233
oras.land/oras-go v1.1.0 // indirect
@@ -213,20 +236,3 @@ require (
213236
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
214237
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
215238
)
216-
217-
// Fix CVE-2021-41092
218-
replace github.com/docker/cli => github.com/docker/cli v20.10.9+incompatible
219-
220-
// Fix CVE-2021-30465
221-
// Fix CVE-2021-43784
222-
// Fix CVE-2019-16884
223-
// Fix GO-2021-0085
224-
// Fix GO-2021-0087
225-
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.0
226-
227-
// Fix CVE-2021-41190
228-
replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
229-
230-
// Fix CVE-2022-23648
231-
// Fix CVE-2021-43816
232-
replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.1

0 commit comments

Comments
 (0)