Skip to content

Commit 51ce64d

Browse files
hiddecohiddeco
authored
Merge pull request #554 from fluxcd/update-go-deps
Update Go dependencies
2 parents 710afdc + 9b45bef commit 51ce64d

File tree

4 files changed

+67
-58
lines changed

4 files changed

+67
-58
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/fluxcd/image-automation-controller/api
33
go 1.20
44

55
require (
6-
github.com/fluxcd/pkg/apis/meta v1.1.0
6+
github.com/fluxcd/pkg/apis/meta v1.1.1
77
github.com/fluxcd/source-controller/api v1.0.0-rc.5
8-
k8s.io/apimachinery v0.27.2
8+
k8s.io/apimachinery v0.27.3
99
sigs.k8s.io/controller-runtime v0.15.0
1010
)
1111

‎api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/fluxcd/pkg/apis/meta v1.1.0 h1:vYU1mvUzztnQyTzZOLHQ3wm/tXd7E1QZ2V91zuVJPsQ=
6-
github.com/fluxcd/pkg/apis/meta v1.1.0/go.mod h1:/QwCotRKL/BT6RSa4O75FlYW14fU8eRfKnoagzbkmL4=
5+
github.com/fluxcd/pkg/apis/meta v1.1.1 h1:sLAKLbEu7rRzJ+Mytffu3NcpfdbOBTa6hcpOQzFWm+M=
6+
github.com/fluxcd/pkg/apis/meta v1.1.1/go.mod h1:soCfzjFWbm1mqybDcOywWKTCEYlH3skpoNGTboVk234=
77
github.com/fluxcd/source-controller/api v1.0.0-rc.5 h1:muoGOb/VitVEIOh877Ledi9AvibbyevPqvuH5byWU6g=
88
github.com/fluxcd/source-controller/api v1.0.0-rc.5/go.mod h1:W6tNXr3mRPhdc5+Jke9OZnuk/3THNzGzRJVhAtLfzss=
99
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -80,8 +80,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
8080
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
8181
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
8282
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
83-
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
84-
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
83+
k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
84+
k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
8585
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
8686
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
8787
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=

‎go.mod‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,39 @@ replace github.com/fluxcd/image-automation-controller/api => ./api
77
// Replace go-git to unreleased v5.8.0 to improve support for Git v2.41+.
88
replace github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.7.1-0.20230702134234-dd4e2b7f4b01
99

10+
// Pin kustomize to v5.0.3
11+
replace (
12+
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.13.4
13+
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.14.2
14+
)
15+
1016
require (
1117
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1
1218
github.com/Masterminds/sprig/v3 v3.2.3
13-
github.com/ProtonMail/go-crypto v0.0.0-20230619160724-3fbb1f12458c
19+
github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec
1420
github.com/cyphar/filepath-securejoin v0.2.3
1521
github.com/fluxcd/image-automation-controller/api v0.34.1
1622
github.com/fluxcd/image-reflector-controller/api v0.28.0
1723
github.com/fluxcd/pkg/apis/acl v0.1.0
18-
github.com/fluxcd/pkg/apis/event v0.5.0
19-
github.com/fluxcd/pkg/apis/meta v1.1.0
24+
github.com/fluxcd/pkg/apis/event v0.5.1
25+
github.com/fluxcd/pkg/apis/meta v1.1.1
2026
github.com/fluxcd/pkg/git v0.12.3
2127
github.com/fluxcd/pkg/git/gogit v0.12.1
2228
github.com/fluxcd/pkg/gittestserver v0.8.4
23-
github.com/fluxcd/pkg/runtime v0.38.1
29+
github.com/fluxcd/pkg/runtime v0.40.0
2430
github.com/fluxcd/pkg/ssh v0.8.0
2531
github.com/fluxcd/source-controller/api v1.0.0-rc.5
2632
github.com/go-git/go-billy/v5 v5.4.1
2733
github.com/go-git/go-git/v5 v5.7.0
2834
github.com/go-logr/logr v1.2.4
2935
github.com/google/go-containerregistry v0.15.2
3036
github.com/onsi/gomega v1.27.8
31-
github.com/otiai10/copy v1.11.0
37+
github.com/otiai10/copy v1.12.0
3238
github.com/spf13/pflag v1.0.5
33-
k8s.io/api v0.27.2
34-
k8s.io/apimachinery v0.27.2
35-
k8s.io/client-go v0.27.2
36-
k8s.io/kube-openapi v0.0.0-20230524182850-78281498afbb
39+
k8s.io/api v0.27.3
40+
k8s.io/apimachinery v0.27.3
41+
k8s.io/client-go v0.27.3
42+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
3743
k8s.io/utils v0.0.0-20230505201702-9f6742963106
3844
sigs.k8s.io/controller-runtime v0.15.0
3945
sigs.k8s.io/kustomize/kyaml v0.14.2
@@ -46,7 +52,7 @@ require (
4652
github.com/Masterminds/semver/v3 v3.2.1 // indirect
4753
github.com/Microsoft/go-winio v0.6.1 // indirect
4854
github.com/acomagu/bufpipe v1.0.4 // indirect
49-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
55+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5056
github.com/beorn7/perks v1.0.1 // indirect
5157
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5258
github.com/chai2010/gettext-go v1.0.2 // indirect
@@ -64,7 +70,7 @@ require (
6470
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6571
github.com/go-logr/zapr v1.2.4 // indirect
6672
github.com/go-openapi/jsonpointer v0.19.6 // indirect
67-
github.com/go-openapi/jsonreference v0.20.1 // indirect
73+
github.com/go-openapi/jsonreference v0.20.2 // indirect
6874
github.com/go-openapi/swag v0.22.3 // indirect
6975
github.com/gofrs/uuid v4.2.0+incompatible // indirect
7076
github.com/gogo/protobuf v1.3.2 // indirect
@@ -79,7 +85,7 @@ require (
7985
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8086
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8187
github.com/hashicorp/go-hclog v1.3.1 // indirect
82-
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
88+
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
8389
github.com/huandu/xstrings v1.3.3 // indirect
8490
github.com/imdario/mergo v0.3.15 // indirect
8591
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -94,6 +100,7 @@ require (
94100
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
95101
github.com/mitchellh/copystructure v1.2.0 // indirect
96102
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
103+
github.com/mitchellh/mapstructure v1.4.1 // indirect
97104
github.com/mitchellh/reflectwalk v1.0.2 // indirect
98105
github.com/moby/spdystream v0.2.0 // indirect
99106
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
@@ -105,18 +112,18 @@ require (
105112
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
106113
github.com/pjbgf/sha1cd v0.3.0 // indirect
107114
github.com/pkg/errors v0.9.1 // indirect
108-
github.com/prometheus/client_golang v1.15.1 // indirect
115+
github.com/prometheus/client_golang v1.16.0 // indirect
109116
github.com/prometheus/client_model v0.4.0 // indirect
110117
github.com/prometheus/common v0.42.0 // indirect
111-
github.com/prometheus/procfs v0.9.0 // indirect
118+
github.com/prometheus/procfs v0.10.1 // indirect
112119
github.com/russross/blackfriday v1.6.0 // indirect
113120
github.com/sergi/go-diff v1.3.1 // indirect
114121
github.com/shopspring/decimal v1.2.0 // indirect
115122
github.com/skeema/knownhosts v1.1.1 // indirect
116123
github.com/spf13/cast v1.5.0 // indirect
117124
github.com/spf13/cobra v1.7.0 // indirect
118125
github.com/xanzy/ssh-agent v0.3.3 // indirect
119-
github.com/xlab/treeprint v1.1.0 // indirect
126+
github.com/xlab/treeprint v1.2.0 // indirect
120127
go.starlark.net v0.0.0-20221028183056-acb66ad56dd2 // indirect
121128
go.uber.org/atomic v1.10.0 // indirect
122129
go.uber.org/multierr v1.8.0 // indirect
@@ -137,9 +144,9 @@ require (
137144
gopkg.in/warnings.v0 v0.1.2 // indirect
138145
gopkg.in/yaml.v2 v2.4.0 // indirect
139146
gopkg.in/yaml.v3 v3.0.1 // indirect
140-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
147+
k8s.io/apiextensions-apiserver v0.27.3 // indirect
141148
k8s.io/cli-runtime v0.27.2 // indirect
142-
k8s.io/component-base v0.27.2 // indirect
149+
k8s.io/component-base v0.27.3 // indirect
143150
k8s.io/klog/v2 v2.100.1 // indirect
144151
k8s.io/kubectl v0.25.4 // indirect
145152
sigs.k8s.io/cli-utils v0.34.0 // indirect

0 commit comments

Comments
 (0)