Skip to content

Commit f380eae

Browse files
hiddecohiddeco
authored
Merge pull request #1318 from fluxcd/backport-1317-to-release/v1.2.x
[release/v1.2.x] Update dependencies
2 parents 3c2a1e0 + dcfc5b4 commit f380eae

File tree

4 files changed

+88
-91
lines changed

4 files changed

+88
-91
lines changed

‎api/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ require (
1313
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
1414

1515
require (
16-
github.com/go-logr/logr v1.2.4 // indirect
16+
github.com/go-logr/logr v1.3.0 // indirect
1717
github.com/gogo/protobuf v1.3.2 // indirect
1818
github.com/google/gofuzz v1.2.0 // indirect
1919
github.com/json-iterator/go v1.1.12 // indirect
2020
github.com/kr/text v0.2.0 // indirect
2121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2222
github.com/modern-go/reflect2 v1.0.2 // indirect
23-
golang.org/x/net v0.17.0 // indirect
24-
golang.org/x/text v0.13.0 // indirect
23+
golang.org/x/net v0.19.0 // indirect
24+
golang.org/x/text v0.14.0 // indirect
2525
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2626
gopkg.in/inf.v0 v0.9.1 // indirect
2727
gopkg.in/yaml.v2 v2.4.0 // indirect
28-
k8s.io/klog/v2 v2.100.1 // indirect
29-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
28+
k8s.io/klog/v2 v2.110.1 // indirect
29+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
3030
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
31-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
31+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
3232
)

‎api/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6
66
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
77
github.com/fluxcd/pkg/apis/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
88
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
9-
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
10-
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
11-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
9+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
10+
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1211
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
1312
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1413
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
1514
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
15+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
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=
@@ -52,19 +52,19 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
5252
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5353
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5454
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
55-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
56-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
55+
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
56+
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
5757
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5858
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5959
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6060
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6161
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6262
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
63-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
63+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
6464
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6565
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
66-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
67-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
66+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
67+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
6868
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
6969
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
7070
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -86,14 +86,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
8686
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
8787
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
8888
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
89-
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
90-
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
91-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
92-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
89+
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
90+
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
91+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
92+
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
9393
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
9494
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
9595
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
9696
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
97-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
98-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
97+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
98+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
9999
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=

‎go.mod

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ replace github.com/fluxcd/source-controller/api => ./api
88
// xref: https://github.com/opencontainers/go-digest/pull/66
99
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
1010

11-
replace github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.10.2-0.20231203195647-cec7da63ca04
12-
1311
require (
1412
cloud.google.com/go/storage v1.35.1
1513
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
@@ -21,7 +19,7 @@ require (
2119
github.com/distribution/distribution/v3 v3.0.0-20230821124843-59dd684cc897
2220
github.com/docker/cli v24.0.7+incompatible
2321
github.com/docker/go-units v0.5.0
24-
github.com/fluxcd/cli-utils v0.36.0-flux.1
22+
github.com/fluxcd/cli-utils v0.36.0-flux.2
2523
github.com/fluxcd/pkg/apis/event v0.6.0
2624
github.com/fluxcd/pkg/apis/meta v1.2.0
2725
github.com/fluxcd/pkg/git v0.16.0
@@ -30,8 +28,8 @@ require (
3028
github.com/fluxcd/pkg/helmtestserver v0.15.0
3129
github.com/fluxcd/pkg/lockedfile v0.1.0
3230
github.com/fluxcd/pkg/masktoken v0.2.0
33-
github.com/fluxcd/pkg/oci v0.33.1
34-
github.com/fluxcd/pkg/runtime v0.43.0
31+
github.com/fluxcd/pkg/oci v0.33.2
32+
github.com/fluxcd/pkg/runtime v0.43.1
3533
github.com/fluxcd/pkg/sourceignore v0.4.0
3634
github.com/fluxcd/pkg/ssh v0.10.0
3735
github.com/fluxcd/pkg/tar v0.4.0
@@ -40,7 +38,7 @@ require (
4038
github.com/fluxcd/source-controller/api v1.2.1
4139
github.com/foxcpp/go-mockdns v1.0.0
4240
github.com/go-git/go-billy/v5 v5.5.0
43-
github.com/go-git/go-git/v5 v5.10.1
41+
github.com/go-git/go-git/v5 v5.11.0
4442
github.com/go-logr/logr v1.3.0
4543
github.com/google/go-containerregistry v0.17.0
4644
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20231202142526-55ffb0092afd
@@ -113,21 +111,21 @@ require (
113111
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
114112
github.com/aliyun/credentials-go v1.3.1 // indirect
115113
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
116-
github.com/aws/aws-sdk-go-v2 v1.23.5 // indirect
117-
github.com/aws/aws-sdk-go-v2/config v1.25.11 // indirect
118-
github.com/aws/aws-sdk-go-v2/credentials v1.16.9 // indirect
119-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.9 // indirect
120-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.8 // indirect
121-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.8 // indirect
114+
github.com/aws/aws-sdk-go-v2 v1.24.0 // indirect
115+
github.com/aws/aws-sdk-go-v2/config v1.26.0 // indirect
116+
github.com/aws/aws-sdk-go-v2/credentials v1.16.11 // indirect
117+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect
118+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect
119+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect
122120
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
123-
github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 // indirect
121+
github.com/aws/aws-sdk-go-v2/service/ecr v1.23.0 // indirect
124122
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 // indirect
125-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.3 // indirect
126-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.8 // indirect
127-
github.com/aws/aws-sdk-go-v2/service/sso v1.18.2 // indirect
128-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.2 // indirect
129-
github.com/aws/aws-sdk-go-v2/service/sts v1.26.2 // indirect
130-
github.com/aws/smithy-go v1.18.1 // indirect
123+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
124+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect
125+
github.com/aws/aws-sdk-go-v2/service/sso v1.18.4 // indirect
126+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.4 // indirect
127+
github.com/aws/aws-sdk-go-v2/service/sts v1.26.4 // indirect
128+
github.com/aws/smithy-go v1.19.0 // indirect
131129
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
132130
github.com/beorn7/perks v1.0.1 // indirect
133131
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -174,7 +172,7 @@ require (
174172
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
175173
github.com/fsnotify/fsnotify v1.7.0 // indirect
176174
github.com/go-chi/chi v4.1.2+incompatible // indirect
177-
github.com/go-errors/errors v1.4.2 // indirect
175+
github.com/go-errors/errors v1.5.1 // indirect
178176
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
179177
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
180178
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
@@ -359,13 +357,13 @@ require (
359357
k8s.io/apiserver v0.28.4 // indirect
360358
k8s.io/cli-runtime v0.28.4 // indirect
361359
k8s.io/component-base v0.28.4 // indirect
362-
k8s.io/klog/v2 v2.100.1 // indirect
363-
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
360+
k8s.io/klog/v2 v2.110.1 // indirect
361+
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect
364362
k8s.io/kubectl v0.28.4 // indirect
365363
oras.land/oras-go v1.2.4 // indirect
366364
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
367-
sigs.k8s.io/kustomize/api v0.15.0 // indirect
368-
sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect
365+
sigs.k8s.io/kustomize/api v0.16.0 // indirect
366+
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
369367
sigs.k8s.io/release-utils v0.7.7 // indirect
370368
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
371369
)

0 commit comments

Comments
 (0)