Skip to content

Commit beca50a

Browse files
stefanprodanstefanprodan
authored
Merge pull request #629 from fluxcd/dependabot/go_modules/go-deps-f007f2b835
Update controller to Kubernetes 1.28.6
2 parents c04ed65 + 021a40e commit beca50a

File tree

4 files changed

+103
-119
lines changed

4 files changed

+103
-119
lines changed

‎api/go.mod

+4-4
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.2.0
7-
github.com/fluxcd/source-controller/api v1.2.1
8-
k8s.io/apimachinery v0.28.4
6+
github.com/fluxcd/pkg/apis/meta v1.3.0
7+
github.com/fluxcd/source-controller/api v1.2.3
8+
k8s.io/apimachinery v0.28.6
99
sigs.k8s.io/controller-runtime v0.16.3
1010
)
1111

@@ -16,7 +16,7 @@ require (
1616
github.com/json-iterator/go v1.1.12 // indirect
1717
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1818
github.com/modern-go/reflect2 v1.0.2 // indirect
19-
golang.org/x/net v0.19.0 // indirect
19+
golang.org/x/net v0.20.0 // indirect
2020
golang.org/x/text v0.14.0 // indirect
2121
gopkg.in/inf.v0 v0.9.1 // indirect
2222
gopkg.in/yaml.v2 v2.4.0 // indirect

‎api/go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
5-
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
6-
github.com/fluxcd/source-controller/api v1.2.1 h1:zWRfwMB/BkV0A/duZQwHEcrE/abWJQt7DUgYTzn4IzM=
7-
github.com/fluxcd/source-controller/api v1.2.1/go.mod h1:n+PMCJXl/AYCjWHn5N/MUuoIFKfDg4kCDviFIa7fDvI=
4+
github.com/fluxcd/pkg/apis/meta v1.3.0 h1:KxeEc6olmSZvQ5pBONPE4IKxyoWQbqTJF1X6K5nIXpU=
5+
github.com/fluxcd/pkg/apis/meta v1.3.0/go.mod h1:3Ui8xFkoU4sYehqmscjpq7NjqH2YN1A2iX2okbO3/yA=
6+
github.com/fluxcd/source-controller/api v1.2.3 h1:71mXv3Qg9HEhcpqOq1ObmoE+P/HuZNaAvxfI7dqZMo8=
7+
github.com/fluxcd/source-controller/api v1.2.3/go.mod h1:5gaIVVH7hgb8p3HKFp8P6hGmZEC8fKSt4EcrG3g5vZI=
88
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
99
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1010
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -47,15 +47,15 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
4747
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4848
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4949
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
50-
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
51-
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
50+
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
51+
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
5252
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5353
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5454
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5555
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5656
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5757
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
58-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
58+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
5959
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6060
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
6161
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -64,7 +64,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
6464
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
6565
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
6666
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
67-
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
67+
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
6868
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6969
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7070
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -78,8 +78,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
7878
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
7979
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
8080
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
81-
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
82-
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
81+
k8s.io/apimachinery v0.28.6 h1:RsTeR4z6S07srPg6XYrwXpTJVMXsjPXn0ODakMytSW0=
82+
k8s.io/apimachinery v0.28.6/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
8383
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
8484
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
8585
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=

‎go.mod

+29-29
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ replace (
1111
)
1212

1313
require (
14-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1
14+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
1515
github.com/Masterminds/sprig/v3 v3.2.3
16-
github.com/ProtonMail/go-crypto v0.0.0-20231012073058-a7379d079e0e
16+
github.com/ProtonMail/go-crypto v1.1.0-alpha.0
1717
github.com/cyphar/filepath-securejoin v0.2.4
1818
github.com/fluxcd/image-automation-controller/api v0.37.0
1919
github.com/fluxcd/image-reflector-controller/api v0.31.1
2020
github.com/fluxcd/pkg/apis/acl v0.1.0
21-
github.com/fluxcd/pkg/apis/event v0.6.0
22-
github.com/fluxcd/pkg/apis/meta v1.2.0
23-
github.com/fluxcd/pkg/git v0.16.0
24-
github.com/fluxcd/pkg/git/gogit v0.16.1
25-
github.com/fluxcd/pkg/gittestserver v0.9.0
26-
github.com/fluxcd/pkg/runtime v0.43.2
27-
github.com/fluxcd/pkg/ssh v0.10.0
28-
github.com/fluxcd/source-controller/api v1.2.2
21+
github.com/fluxcd/pkg/apis/event v0.7.0
22+
github.com/fluxcd/pkg/apis/meta v1.3.0
23+
github.com/fluxcd/pkg/git v0.17.0
24+
github.com/fluxcd/pkg/git/gogit v0.17.0
25+
github.com/fluxcd/pkg/gittestserver v0.10.0
26+
github.com/fluxcd/pkg/runtime v0.44.0
27+
github.com/fluxcd/pkg/ssh v0.11.0
28+
github.com/fluxcd/source-controller/api v1.2.3
2929
github.com/go-git/go-billy/v5 v5.5.0
3030
github.com/go-git/go-git/v5 v5.11.0
3131
github.com/go-logr/logr v1.3.0
32-
github.com/google/go-containerregistry v0.17.0
33-
github.com/onsi/gomega v1.30.0
32+
github.com/google/go-containerregistry v0.18.0
33+
github.com/onsi/gomega v1.31.1
3434
github.com/otiai10/copy v1.14.0
3535
github.com/spf13/pflag v1.0.5
36-
k8s.io/api v0.28.4
37-
k8s.io/apimachinery v0.28.4
38-
k8s.io/client-go v0.28.4
36+
k8s.io/api v0.28.6
37+
k8s.io/apimachinery v0.28.6
38+
k8s.io/client-go v0.28.6
3939
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8
4040
k8s.io/utils v0.0.0-20231127182322-b307cd553661
4141
sigs.k8s.io/controller-runtime v0.16.3
@@ -59,7 +59,7 @@ require (
5959
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6060
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
6161
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
62-
github.com/fluxcd/cli-utils v0.36.0-flux.2 // indirect
62+
github.com/fluxcd/cli-utils v0.36.0-flux.3 // indirect
6363
github.com/fluxcd/gitkit v0.6.0 // indirect
6464
github.com/fluxcd/pkg/version v0.2.2 // indirect
6565
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -78,7 +78,7 @@ require (
7878
github.com/google/go-cmp v0.6.0 // indirect
7979
github.com/google/gofuzz v1.2.0 // indirect
8080
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
81-
github.com/google/uuid v1.4.0 // indirect
81+
github.com/google/uuid v1.5.0 // indirect
8282
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8383
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8484
github.com/hashicorp/go-hclog v1.3.1 // indirect
@@ -108,7 +108,7 @@ require (
108108
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
109109
github.com/pjbgf/sha1cd v0.3.0 // indirect
110110
github.com/pkg/errors v0.9.1 // indirect
111-
github.com/prometheus/client_golang v1.17.0 // indirect
111+
github.com/prometheus/client_golang v1.18.0 // indirect
112112
github.com/prometheus/client_model v0.5.0 // indirect
113113
github.com/prometheus/common v0.45.0 // indirect
114114
github.com/prometheus/procfs v0.12.0 // indirect
@@ -123,17 +123,17 @@ require (
123123
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
124124
go.uber.org/multierr v1.11.0 // indirect
125125
go.uber.org/zap v1.26.0 // indirect
126-
golang.org/x/crypto v0.17.0 // indirect
126+
golang.org/x/crypto v0.18.0 // indirect
127127
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
128128
golang.org/x/mod v0.14.0 // indirect
129-
golang.org/x/net v0.19.0 // indirect
130-
golang.org/x/oauth2 v0.15.0 // indirect
131-
golang.org/x/sync v0.5.0 // indirect
132-
golang.org/x/sys v0.15.0 // indirect
133-
golang.org/x/term v0.15.0 // indirect
129+
golang.org/x/net v0.20.0 // indirect
130+
golang.org/x/oauth2 v0.16.0 // indirect
131+
golang.org/x/sync v0.6.0 // indirect
132+
golang.org/x/sys v0.16.0 // indirect
133+
golang.org/x/term v0.16.0 // indirect
134134
golang.org/x/text v0.14.0 // indirect
135135
golang.org/x/time v0.5.0 // indirect
136-
golang.org/x/tools v0.16.0 // indirect
136+
golang.org/x/tools v0.17.0 // indirect
137137
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
138138
google.golang.org/appengine v1.6.8 // indirect
139139
google.golang.org/protobuf v1.31.0 // indirect
@@ -142,11 +142,11 @@ require (
142142
gopkg.in/warnings.v0 v0.1.2 // indirect
143143
gopkg.in/yaml.v2 v2.4.0 // indirect
144144
gopkg.in/yaml.v3 v3.0.1 // indirect
145-
k8s.io/apiextensions-apiserver v0.28.4 // indirect
146-
k8s.io/cli-runtime v0.28.4 // indirect
147-
k8s.io/component-base v0.28.4 // indirect
145+
k8s.io/apiextensions-apiserver v0.28.6 // indirect
146+
k8s.io/cli-runtime v0.28.6 // indirect
147+
k8s.io/component-base v0.28.6 // indirect
148148
k8s.io/klog/v2 v2.110.1 // indirect
149-
k8s.io/kubectl v0.28.4 // indirect
149+
k8s.io/kubectl v0.28.6 // indirect
150150
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
151151
sigs.k8s.io/kustomize/api v0.16.0 // indirect
152152
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)