Skip to content

Commit 9271c9b

Browse files
stefanprodanstefanprodan
authored
Merge pull request #661 from fluxcd/go.1.22
Update dependencies to Go 1.22 and Kubernetes 1.29.3
2 parents 9728b40 + 682c598 commit 9271c9b

File tree

10 files changed

+178
-158
lines changed

10 files changed

+178
-158
lines changed

‎.github/workflows/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Go
1717
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1818
with:
19-
go-version: 1.21.x
19+
go-version-file: 'go.mod'
2020
cache-dependency-path: |
2121
**/go.sum
2222
**/go.mod
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Go
3636
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3737
with:
38-
go-version: 1.21.x
38+
go-version-file: 'go.mod'
3939
cache-dependency-path: |
4040
**/go.sum
4141
**/go.mod

‎.github/workflows/cifuzz.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1717
with:
18-
go-version: 1.21.x
18+
go-version-file: 'go.mod'
1919
cache-dependency-path: |
2020
**/go.sum
2121
**/go.mod

‎.github/workflows/scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Go
3636
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3737
with:
38-
go-version: 1.21.x
38+
go-version-file: 'go.mod'
3939
cache-dependency-path: |
4040
**/go.sum
4141
**/go.mod

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_VARIANT=alpine
2-
ARG GO_VERSION=1.21
3-
ARG XX_VERSION=1.3.0
2+
ARG GO_VERSION=1.22
3+
ARG XX_VERSION=1.4.0
44

55
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
66

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
145145
$(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1beta1/image-automation.md
146146

147147
tidy: ## Run go mod tidy
148-
cd api; rm -f go.sum; go mod tidy -compat=1.20
149-
rm -f go.sum; go mod tidy -compat=1.21
148+
cd api; rm -f go.sum; go mod tidy -compat=1.22
149+
rm -f go.sum; go mod tidy -compat=1.22
150150

151151
fmt: ## Run go fmt against code
152152
go fmt ./...

‎api/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module github.com/fluxcd/image-automation-controller/api
22

3-
go 1.20
3+
go 1.22
44

55
require (
6-
github.com/fluxcd/pkg/apis/meta v1.3.0
6+
github.com/fluxcd/pkg/apis/meta v1.4.0
77
github.com/fluxcd/source-controller/api v1.2.4
8-
k8s.io/apimachinery v0.28.6
9-
sigs.k8s.io/controller-runtime v0.16.3
8+
k8s.io/apimachinery v0.29.3
9+
sigs.k8s.io/controller-runtime v0.17.2
1010
)
1111

1212
require (
13-
github.com/go-logr/logr v1.3.0 // indirect
13+
github.com/go-logr/logr v1.4.1 // indirect
1414
github.com/gogo/protobuf v1.3.2 // indirect
1515
github.com/google/gofuzz v1.2.0 // indirect
1616
github.com/json-iterator/go v1.1.12 // indirect

‎api/go.sum

+30-13
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,52 @@
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.3.0 h1:KxeEc6olmSZvQ5pBONPE4IKxyoWQbqTJF1X6K5nIXpU=
5-
github.com/fluxcd/pkg/apis/meta v1.3.0/go.mod h1:3Ui8xFkoU4sYehqmscjpq7NjqH2YN1A2iX2okbO3/yA=
4+
github.com/fluxcd/pkg/apis/meta v1.4.0 h1:nNdgB6FFHP3cubxZCViaCFDUVlAbpq9+hvKEIveOGMg=
5+
github.com/fluxcd/pkg/apis/meta v1.4.0/go.mod h1:81sZ01ShTuLc1C3M1dFJNkINareBysvmrO1b8zJFFKs=
66
github.com/fluxcd/source-controller/api v1.2.4 h1:XjKTWhSSeLGsogWnTcLl5sUnyMlC5TKDbbBgP9SyJ5c=
77
github.com/fluxcd/source-controller/api v1.2.4/go.mod h1:j3QSHpIPBP5sjaGIkVtsgWCx8JcOmcsutRmdJmRMOZg=
8-
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
98
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
9+
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
10+
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1011
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
12+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
1113
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1214
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
13-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1415
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
16+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
17+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1518
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1619
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
1720
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1821
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
22+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
1923
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
2024
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
2125
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
2226
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
2327
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
28+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
2429
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
30+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
2531
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
2632
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
2733
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
2834
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
2935
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
30-
github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
31-
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
36+
github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
37+
github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
38+
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
39+
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
3240
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3341
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3442
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
43+
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
3544
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
45+
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
3646
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3747
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
38-
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
48+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
49+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
3950
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
4051
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
4152
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -56,6 +67,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
5667
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5768
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5869
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
70+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5971
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6072
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
6173
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -65,29 +77,34 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
6577
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
6678
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
6779
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
80+
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
6881
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6982
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7083
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7184
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7285
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7386
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
87+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
7488
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
7589
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
7690
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
7791
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
7892
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
7993
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
80-
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
81-
k8s.io/apimachinery v0.28.6 h1:RsTeR4z6S07srPg6XYrwXpTJVMXsjPXn0ODakMytSW0=
82-
k8s.io/apimachinery v0.28.6/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
94+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
95+
k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A=
96+
k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA=
97+
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
98+
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
8399
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
84100
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
85101
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
86102
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
87-
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
88-
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
103+
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
104+
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
89105
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
90106
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
91107
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
92108
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
93-
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
109+
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
110+
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎go.mod

+43-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fluxcd/image-automation-controller
22

3-
go 1.21
3+
go 1.22
44

55
replace github.com/fluxcd/image-automation-controller/api => ./api
66

@@ -13,32 +13,32 @@ replace (
1313
require (
1414
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 v1.1.0-alpha.0
16+
github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton
1717
github.com/cyphar/filepath-securejoin v0.2.4
1818
github.com/fluxcd/image-automation-controller/api v0.37.1
1919
github.com/fluxcd/image-reflector-controller/api v0.31.2
20-
github.com/fluxcd/pkg/apis/acl v0.1.0
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.1
27-
github.com/fluxcd/pkg/ssh v0.11.0
20+
github.com/fluxcd/pkg/apis/acl v0.2.0
21+
github.com/fluxcd/pkg/apis/event v0.8.0
22+
github.com/fluxcd/pkg/apis/meta v1.4.0
23+
github.com/fluxcd/pkg/git v0.18.0
24+
github.com/fluxcd/pkg/git/gogit v0.18.0
25+
github.com/fluxcd/pkg/gittestserver v0.11.0
26+
github.com/fluxcd/pkg/runtime v0.45.0
27+
github.com/fluxcd/pkg/ssh v0.12.0
2828
github.com/fluxcd/source-controller/api v1.2.4
2929
github.com/go-git/go-billy/v5 v5.5.0
30-
github.com/go-git/go-git/v5 v5.11.0
31-
github.com/go-logr/logr v1.3.0
32-
github.com/google/go-containerregistry v0.19.0
33-
github.com/onsi/gomega v1.31.1
30+
github.com/go-git/go-git/v5 v5.12.0
31+
github.com/go-logr/logr v1.4.1
32+
github.com/google/go-containerregistry v0.19.1
33+
github.com/onsi/gomega v1.32.0
3434
github.com/otiai10/copy v1.14.0
3535
github.com/spf13/pflag v1.0.5
36-
k8s.io/api v0.28.6
37-
k8s.io/apimachinery v0.28.6
38-
k8s.io/client-go v0.28.6
39-
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8
40-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
41-
sigs.k8s.io/controller-runtime v0.16.3
36+
k8s.io/api v0.29.3
37+
k8s.io/apimachinery v0.29.3
38+
k8s.io/client-go v0.29.3
39+
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940
40+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
41+
sigs.k8s.io/controller-runtime v0.17.2
4242
sigs.k8s.io/kustomize/kyaml v0.16.0
4343
)
4444

@@ -57,11 +57,11 @@ require (
5757
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5858
github.com/emirpasic/gods v1.18.1 // indirect
5959
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
60-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
60+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
6161
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
62-
github.com/fluxcd/cli-utils v0.36.0-flux.3 // indirect
62+
github.com/fluxcd/cli-utils v0.36.0-flux.4 // indirect
6363
github.com/fluxcd/gitkit v0.6.0 // indirect
64-
github.com/fluxcd/pkg/version v0.2.2 // indirect
64+
github.com/fluxcd/pkg/version v0.3.0 // indirect
6565
github.com/fsnotify/fsnotify v1.7.0 // indirect
6666
github.com/go-errors/errors v1.5.1 // indirect
6767
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -72,13 +72,14 @@ require (
7272
github.com/gofrs/uuid v4.4.0+incompatible // indirect
7373
github.com/gogo/protobuf v1.3.2 // indirect
7474
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
75-
github.com/golang/protobuf v1.5.3 // indirect
75+
github.com/golang/protobuf v1.5.4 // indirect
7676
github.com/google/btree v1.1.2 // indirect
7777
github.com/google/gnostic-models v0.6.8 // indirect
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.5.0 // indirect
81+
github.com/google/uuid v1.6.0 // indirect
82+
github.com/gorilla/websocket v1.5.0 // indirect
8283
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8384
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8485
github.com/hashicorp/go-hclog v1.3.1 // indirect
@@ -94,7 +95,6 @@ require (
9495
github.com/mailru/easyjson v0.7.7 // indirect
9596
github.com/mattn/go-colorable v0.1.13 // indirect
9697
github.com/mattn/go-isatty v0.0.16 // indirect
97-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9898
github.com/mitchellh/copystructure v1.2.0 // indirect
9999
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
100100
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -104,36 +104,37 @@ require (
104104
github.com/modern-go/reflect2 v1.0.2 // indirect
105105
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
106106
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
107+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
107108
github.com/opencontainers/go-digest v1.0.0 // indirect
108109
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
109110
github.com/pjbgf/sha1cd v0.3.0 // indirect
110111
github.com/pkg/errors v0.9.1 // indirect
111-
github.com/prometheus/client_golang v1.18.0 // indirect
112+
github.com/prometheus/client_golang v1.19.0 // indirect
112113
github.com/prometheus/client_model v0.5.0 // indirect
113-
github.com/prometheus/common v0.45.0 // indirect
114+
github.com/prometheus/common v0.48.0 // indirect
114115
github.com/prometheus/procfs v0.12.0 // indirect
115116
github.com/russross/blackfriday/v2 v2.1.0 // indirect
116-
github.com/sergi/go-diff v1.3.1 // indirect
117+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
117118
github.com/shopspring/decimal v1.2.0 // indirect
118-
github.com/skeema/knownhosts v1.2.1 // indirect
119+
github.com/skeema/knownhosts v1.2.2 // indirect
119120
github.com/spf13/cast v1.5.0 // indirect
120121
github.com/spf13/cobra v1.8.0 // indirect
121122
github.com/xanzy/ssh-agent v0.3.3 // indirect
122123
github.com/xlab/treeprint v1.2.0 // indirect
123124
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
124125
go.uber.org/multierr v1.11.0 // indirect
125-
go.uber.org/zap v1.26.0 // indirect
126-
golang.org/x/crypto v0.18.0 // indirect
126+
go.uber.org/zap v1.27.0 // indirect
127+
golang.org/x/crypto v0.21.0 // indirect
127128
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
128-
golang.org/x/mod v0.14.0 // indirect
129-
golang.org/x/net v0.20.0 // indirect
129+
golang.org/x/mod v0.16.0 // indirect
130+
golang.org/x/net v0.22.0 // indirect
130131
golang.org/x/oauth2 v0.16.0 // indirect
131132
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
133+
golang.org/x/sys v0.18.0 // indirect
134+
golang.org/x/term v0.18.0 // indirect
134135
golang.org/x/text v0.14.0 // indirect
135136
golang.org/x/time v0.5.0 // indirect
136-
golang.org/x/tools v0.17.0 // indirect
137+
golang.org/x/tools v0.19.0 // indirect
137138
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
138139
google.golang.org/appengine v1.6.8 // indirect
139140
google.golang.org/protobuf v1.33.0 // indirect
@@ -142,11 +143,11 @@ require (
142143
gopkg.in/warnings.v0 v0.1.2 // indirect
143144
gopkg.in/yaml.v2 v2.4.0 // indirect
144145
gopkg.in/yaml.v3 v3.0.1 // 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
148-
k8s.io/klog/v2 v2.110.1 // indirect
149-
k8s.io/kubectl v0.28.6 // indirect
146+
k8s.io/apiextensions-apiserver v0.29.3 // indirect
147+
k8s.io/cli-runtime v0.29.3 // indirect
148+
k8s.io/component-base v0.29.3 // indirect
149+
k8s.io/klog/v2 v2.120.1 // indirect
150+
k8s.io/kubectl v0.29.3 // indirect
150151
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
151152
sigs.k8s.io/kustomize/api v0.16.0 // indirect
152153
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)