Skip to content

Commit 2bd9991

Browse files
authored
Merge pull request #978 from fluxcd/k8s-1.34.1
Update dependencies to Kubernetes v1.34.1 and Go 1.25.2
2 parents 1a4800d + ef877b1 commit 2bd9991

File tree

4 files changed

+166
-164
lines changed

4 files changed

+166
-164
lines changed

api/go.mod

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

55
require (
6-
github.com/fluxcd/pkg/apis/meta v1.21.0
7-
github.com/fluxcd/source-controller/api v1.7.0
8-
k8s.io/apimachinery v0.34.0
9-
sigs.k8s.io/controller-runtime v0.22.1
6+
github.com/fluxcd/pkg/apis/meta v1.22.0
7+
github.com/fluxcd/source-controller/api v1.7.2
8+
k8s.io/apimachinery v0.34.1
9+
sigs.k8s.io/controller-runtime v0.22.2
1010
)
1111

1212
require (
@@ -23,7 +23,7 @@ require (
2323
github.com/stretchr/testify v1.11.1 // indirect
2424
github.com/x448/float16 v0.8.4 // indirect
2525
go.yaml.in/yaml/v2 v2.4.2 // indirect
26-
golang.org/x/net v0.44.0 // indirect
26+
golang.org/x/net v0.45.0 // indirect
2727
golang.org/x/text v0.29.0 // indirect
2828
gopkg.in/inf.v0 v0.9.1 // indirect
2929
k8s.io/klog/v2 v2.130.1 // indirect

api/go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ 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=
55
github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA=
66
github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4=
7-
github.com/fluxcd/pkg/apis/meta v1.21.0 h1:R+bN02chcs0HUmyVDQhqe/FHmYLjipVDMLnyYfNX850=
8-
github.com/fluxcd/pkg/apis/meta v1.21.0/go.mod h1:XUAEUgT4gkWDAEN79E141tmL+v4SV50tVZ/Ojpc/ueg=
9-
github.com/fluxcd/source-controller/api v1.7.0 h1:y6vjvbkIN4JzianhmaJqujeghVpvQn3gcsVW/f1xMeA=
10-
github.com/fluxcd/source-controller/api v1.7.0/go.mod h1:UOIEs9AACxPW7fQFqGWw1/FN2QqYDLG6WkvPIyscHkw=
7+
github.com/fluxcd/pkg/apis/meta v1.22.0 h1:EHWQH5ZWml7i8eZ/AMjm1jxid3j/PQ31p+hIwCt6crM=
8+
github.com/fluxcd/pkg/apis/meta v1.22.0/go.mod h1:Kc1+bWe5p0doROzuV9XiTfV/oL3ddsemYXt8ZYWdVVg=
9+
github.com/fluxcd/source-controller/api v1.7.2 h1:/lg/xoyRjxwdhHKqjTxQS2o1cp+DMKJ8W4rpm+ZLemQ=
10+
github.com/fluxcd/source-controller/api v1.7.2/go.mod h1:2JtCeUVpl0aqKImS19jUz9EEnMdzgqNWHkllrIhV004=
1111
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
1212
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
1313
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
@@ -65,8 +65,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
6565
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6666
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6767
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
68-
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
69-
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
68+
golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
69+
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
7070
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7171
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7272
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -96,16 +96,16 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
9696
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
9797
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9898
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
99-
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
100-
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
101-
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
102-
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
99+
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
100+
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
101+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
102+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
103103
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
104104
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
105105
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=
106106
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
107-
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
108-
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
107+
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
108+
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
109109
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
110110
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
111111
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

go.mod

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -16,69 +16,69 @@ require (
1616
github.com/ProtonMail/go-crypto v1.3.0
1717
github.com/cyphar/filepath-securejoin v0.4.1
1818
github.com/fluxcd/image-automation-controller/api v1.0.0
19-
github.com/fluxcd/image-reflector-controller/api v1.0.0
19+
github.com/fluxcd/image-reflector-controller/api v1.0.2
2020
github.com/fluxcd/pkg/apis/acl v0.9.0
21-
github.com/fluxcd/pkg/apis/event v0.19.0
22-
github.com/fluxcd/pkg/apis/meta v1.21.0
23-
github.com/fluxcd/pkg/auth v0.31.0
24-
github.com/fluxcd/pkg/cache v0.11.0
25-
github.com/fluxcd/pkg/git v0.36.0
26-
github.com/fluxcd/pkg/git/gogit v0.40.0
27-
github.com/fluxcd/pkg/gittestserver v0.20.0
28-
github.com/fluxcd/pkg/runtime v0.85.0
29-
github.com/fluxcd/pkg/ssh v0.21.0
30-
github.com/fluxcd/source-controller/api v1.7.0
21+
github.com/fluxcd/pkg/apis/event v0.20.0
22+
github.com/fluxcd/pkg/apis/meta v1.22.0
23+
github.com/fluxcd/pkg/auth v0.32.0
24+
github.com/fluxcd/pkg/cache v0.12.0
25+
github.com/fluxcd/pkg/git v0.37.0
26+
github.com/fluxcd/pkg/git/gogit v0.41.0
27+
github.com/fluxcd/pkg/gittestserver v0.21.0
28+
github.com/fluxcd/pkg/runtime v0.88.0
29+
github.com/fluxcd/pkg/ssh v0.22.0
30+
github.com/fluxcd/source-controller/api v1.7.2
3131
github.com/go-git/go-billy/v5 v5.6.2
32-
github.com/go-git/go-git/v5 v5.16.2
32+
github.com/go-git/go-git/v5 v5.16.3
3333
github.com/go-logr/logr v1.4.3
3434
github.com/google/go-containerregistry v0.20.6
3535
github.com/onsi/gomega v1.38.2
3636
github.com/otiai10/copy v1.14.1
37-
github.com/spf13/pflag v1.0.7
38-
k8s.io/api v0.34.0
39-
k8s.io/apimachinery v0.34.0
40-
k8s.io/client-go v0.34.0
37+
github.com/spf13/pflag v1.0.10
38+
k8s.io/api v0.34.1
39+
k8s.io/apimachinery v0.34.1
40+
k8s.io/client-go v0.34.1
4141
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
4242
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
43-
sigs.k8s.io/controller-runtime v0.22.1
43+
sigs.k8s.io/controller-runtime v0.22.2
4444
sigs.k8s.io/kustomize/kyaml v0.20.1
4545
)
4646

4747
require (
48-
cloud.google.com/go/auth v0.16.5 // indirect
48+
cloud.google.com/go/auth v0.17.0 // indirect
4949
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
50-
cloud.google.com/go/compute/metadata v0.8.0 // indirect
50+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
5151
dario.cat/mergo v1.0.1 // indirect
52-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 // indirect
53-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 // indirect
52+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
53+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 // indirect
5454
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.3 // indirect
5555
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
5656
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice v1.0.0 // indirect
5757
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
58-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
58+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
5959
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6060
github.com/Masterminds/goutils v1.1.1 // indirect
6161
github.com/Masterminds/semver/v3 v3.4.0 // indirect
6262
github.com/Microsoft/go-winio v0.6.2 // indirect
63-
github.com/aws/aws-sdk-go-v2 v1.38.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
65-
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
66-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
67-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect
68-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect
63+
github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
64+
github.com/aws/aws-sdk-go-v2/config v1.31.12 // indirect
65+
github.com/aws/aws-sdk-go-v2/credentials v1.18.16 // indirect
66+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
67+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
68+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
6969
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
71-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
72-
github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.5 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.6 // indirect
72+
github.com/aws/aws-sdk-go-v2/service/eks v1.74.2 // indirect
7373
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
74-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect
75-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
76-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
77-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
74+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
75+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect
76+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect
77+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect
7878
github.com/aws/smithy-go v1.23.0 // indirect
7979
github.com/beorn7/perks v1.0.1 // indirect
8080
github.com/blang/semver/v4 v4.0.0 // indirect
81-
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 // indirect
81+
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 // indirect
8282
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8383
github.com/chai2010/gettext-go v1.0.3 // indirect
8484
github.com/cloudflare/circl v1.6.1 // indirect
@@ -92,7 +92,7 @@ require (
9292
github.com/felixge/httpsnoop v1.0.4 // indirect
9393
github.com/fluxcd/cli-utils v0.36.0-flux.15 // indirect
9494
github.com/fluxcd/gitkit v0.6.0 // indirect
95-
github.com/fluxcd/pkg/version v0.10.0 // indirect
95+
github.com/fluxcd/pkg/version v0.11.0 // indirect
9696
github.com/fsnotify/fsnotify v1.9.0 // indirect
9797
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
9898
github.com/go-errors/errors v1.5.1 // indirect
@@ -110,7 +110,7 @@ require (
110110
github.com/google/btree v1.1.3 // indirect
111111
github.com/google/gnostic-models v0.7.0 // indirect
112112
github.com/google/go-cmp v0.7.0 // indirect
113-
github.com/google/go-github/v72 v72.0.0 // indirect
113+
github.com/google/go-github/v75 v75.0.0 // indirect
114114
github.com/google/go-querystring v1.1.0 // indirect
115115
github.com/google/s2a-go v0.1.9 // indirect
116116
github.com/google/uuid v1.6.0 // indirect
@@ -147,9 +147,9 @@ require (
147147
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
148148
github.com/pkg/errors v0.9.1 // indirect
149149
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
150-
github.com/prometheus/client_golang v1.23.0 // indirect
150+
github.com/prometheus/client_golang v1.23.2 // indirect
151151
github.com/prometheus/client_model v0.6.2 // indirect
152-
github.com/prometheus/common v0.65.0 // indirect
152+
github.com/prometheus/common v0.66.1 // indirect
153153
github.com/prometheus/procfs v0.17.0 // indirect
154154
github.com/russross/blackfriday/v2 v2.1.0 // indirect
155155
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
@@ -171,25 +171,25 @@ require (
171171
go.yaml.in/yaml/v2 v2.4.2 // indirect
172172
go.yaml.in/yaml/v3 v3.0.4 // indirect
173173
golang.org/x/crypto v0.42.0 // indirect
174-
golang.org/x/net v0.44.0 // indirect
174+
golang.org/x/net v0.45.0 // indirect
175175
golang.org/x/oauth2 v0.31.0 // indirect
176176
golang.org/x/sync v0.17.0 // indirect
177177
golang.org/x/sys v0.36.0 // indirect
178178
golang.org/x/term v0.35.0 // indirect
179179
golang.org/x/text v0.29.0 // indirect
180180
golang.org/x/time v0.13.0 // indirect
181181
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
182-
google.golang.org/api v0.248.0 // indirect
183-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
184-
google.golang.org/grpc v1.74.2 // indirect
185-
google.golang.org/protobuf v1.36.7 // indirect
182+
google.golang.org/api v0.252.0 // indirect
183+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect
184+
google.golang.org/grpc v1.75.1 // indirect
185+
google.golang.org/protobuf v1.36.10 // indirect
186186
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
187187
gopkg.in/inf.v0 v0.9.1 // indirect
188188
gopkg.in/warnings.v0 v0.1.2 // indirect
189189
gopkg.in/yaml.v3 v3.0.1 // indirect
190-
k8s.io/apiextensions-apiserver v0.34.0 // indirect
190+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
191191
k8s.io/cli-runtime v0.34.0 // indirect
192-
k8s.io/component-base v0.34.0 // indirect
192+
k8s.io/component-base v0.34.1 // indirect
193193
k8s.io/klog/v2 v2.130.1 // indirect
194194
k8s.io/kubectl v0.34.0 // indirect
195195
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect

0 commit comments

Comments
 (0)