Skip to content

Commit c13d3b0

Browse files
authored
Merge pull request #1330 from fluxcd/backport-1329-to-release/v1.4.x
[release/v1.4.x] Update dependencies to Kubernetes v1.34.1 and Go 1.25.2
2 parents 5961301 + d2e2425 commit c13d3b0

File tree

4 files changed

+165
-164
lines changed

4 files changed

+165
-164
lines changed

api/go.mod

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

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v1.12.0
7-
github.com/fluxcd/pkg/apis/meta v1.21.0
8-
k8s.io/apiextensions-apiserver v0.34.0
9-
k8s.io/apimachinery v0.34.0
10-
sigs.k8s.io/controller-runtime v0.22.1
6+
github.com/fluxcd/pkg/apis/kustomize v1.13.0
7+
github.com/fluxcd/pkg/apis/meta v1.22.0
8+
k8s.io/apiextensions-apiserver v0.34.1
9+
k8s.io/apimachinery v0.34.1
10+
sigs.k8s.io/controller-runtime v0.22.2
1111
sigs.k8s.io/yaml v1.6.0
1212
)
1313

@@ -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
golang.org/x/tools v0.37.0 // indirect
2929
gopkg.in/inf.v0 v0.9.1 // indirect

api/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ 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/kustomize v1.12.0 h1:KvZN6xwgP/dNSeckL4a/Uv715XqiN1C3xS+jGcPejtE=
6-
github.com/fluxcd/pkg/apis/kustomize v1.12.0/go.mod h1:OojLxIdKm1JAAdh3sL4j4F+vfrLKb7kq1vr8bpyEKgg=
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=
5+
github.com/fluxcd/pkg/apis/kustomize v1.13.0 h1:GGf0UBVRIku+gebY944icVeEIhyg1P/KE3IrhOyJJnE=
6+
github.com/fluxcd/pkg/apis/kustomize v1.13.0/go.mod h1:TLKVqbtnzkhDuhWnAsN35977HvRfIjs+lgMuNro/LEc=
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=
99
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
1010
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
1111
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
@@ -66,8 +66,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
6666
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6767
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6868
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
69-
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
70-
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
69+
golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
70+
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
7171
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7272
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7373
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -97,18 +97,18 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
9797
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
9898
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9999
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
100-
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
101-
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
102-
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
103-
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
104-
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
105-
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
100+
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
101+
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
102+
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
103+
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
104+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
105+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
106106
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
107107
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
108108
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=
109109
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
110-
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
111-
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
110+
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
111+
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
112112
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
113113
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
114114
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
@@ -19,16 +19,16 @@ require (
1919
github.com/fluxcd/cli-utils v0.36.0-flux.15
2020
github.com/fluxcd/helm-controller/api v1.4.1
2121
github.com/fluxcd/pkg/apis/acl v0.9.0
22-
github.com/fluxcd/pkg/apis/event v0.19.0
23-
github.com/fluxcd/pkg/apis/kustomize v1.12.0
24-
github.com/fluxcd/pkg/apis/meta v1.21.0
25-
github.com/fluxcd/pkg/auth v0.31.0
26-
github.com/fluxcd/pkg/cache v0.11.0
27-
github.com/fluxcd/pkg/chartutil v1.14.0
28-
github.com/fluxcd/pkg/runtime v0.86.0
29-
github.com/fluxcd/pkg/ssa v0.56.0
22+
github.com/fluxcd/pkg/apis/event v0.20.0
23+
github.com/fluxcd/pkg/apis/kustomize v1.13.0
24+
github.com/fluxcd/pkg/apis/meta v1.22.0
25+
github.com/fluxcd/pkg/auth v0.32.0
26+
github.com/fluxcd/pkg/cache v0.12.0
27+
github.com/fluxcd/pkg/chartutil v1.15.0
28+
github.com/fluxcd/pkg/runtime v0.88.0
29+
github.com/fluxcd/pkg/ssa v0.60.0
3030
github.com/fluxcd/pkg/testserver v0.13.0
31-
github.com/fluxcd/source-controller/api v1.7.0
31+
github.com/fluxcd/source-controller/api v1.7.2
3232
github.com/go-logr/logr v1.4.3
3333
github.com/google/cel-go v0.26.1
3434
github.com/google/go-cmp v0.7.0
@@ -37,59 +37,59 @@ require (
3737
github.com/onsi/gomega v1.38.2
3838
github.com/opencontainers/go-digest v1.0.1-0.20231025023718-d50d2fec9c98
3939
github.com/opencontainers/go-digest/blake3 v0.0.0-20250116041648-1e56c6daea3b
40-
github.com/spf13/pflag v1.0.9
40+
github.com/spf13/pflag v1.0.10
4141
github.com/wI2L/jsondiff v0.7.0
4242
go.uber.org/zap v1.27.0
4343
golang.org/x/text v0.29.0
4444
helm.sh/helm/v3 v3.19.0
45-
k8s.io/api v0.34.0
46-
k8s.io/apiextensions-apiserver v0.34.0
47-
k8s.io/apimachinery v0.34.0
48-
k8s.io/cli-runtime v0.34.0
49-
k8s.io/client-go v0.34.0
50-
k8s.io/kubectl v0.34.0
45+
k8s.io/api v0.34.1
46+
k8s.io/apiextensions-apiserver v0.34.1
47+
k8s.io/apimachinery v0.34.1
48+
k8s.io/cli-runtime v0.34.1
49+
k8s.io/client-go v0.34.1
50+
k8s.io/kubectl v0.34.1
5151
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
52-
sigs.k8s.io/controller-runtime v0.22.1
52+
sigs.k8s.io/controller-runtime v0.22.2
5353
sigs.k8s.io/kustomize/api v0.20.1
5454
sigs.k8s.io/kustomize/kyaml v0.20.1
5555
sigs.k8s.io/yaml v1.6.0
5656
)
5757

5858
require (
5959
cel.dev/expr v0.24.0 // indirect
60-
cloud.google.com/go/auth v0.16.5 // indirect
60+
cloud.google.com/go/auth v0.17.0 // indirect
6161
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
62-
cloud.google.com/go/compute/metadata v0.8.0 // indirect
62+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
6363
dario.cat/mergo v1.0.1 // indirect
64-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 // indirect
65-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 // indirect
64+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
65+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 // indirect
6666
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.3 // indirect
6767
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
6868
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice v1.0.0 // indirect
6969
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
70-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
70+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
7171
github.com/BurntSushi/toml v1.5.0 // indirect
7272
github.com/MakeNowJust/heredoc v1.0.0 // indirect
7373
github.com/Masterminds/goutils v1.1.1 // indirect
7474
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
7575
github.com/Masterminds/squirrel v1.5.4 // indirect
7676
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
7777
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
78-
github.com/aws/aws-sdk-go-v2 v1.38.3 // indirect
79-
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
80-
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
81-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
82-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect
83-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect
78+
github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
79+
github.com/aws/aws-sdk-go-v2/config v1.31.12 // indirect
80+
github.com/aws/aws-sdk-go-v2/credentials v1.18.16 // indirect
81+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
82+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
83+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
8484
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
86-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
87-
github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.5 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.6 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/eks v1.74.2 // indirect
8888
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
89-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect
90-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
91-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
92-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
89+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
90+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect
9393
github.com/aws/smithy-go v1.23.0 // indirect
9494
github.com/beorn7/perks v1.0.1 // indirect
9595
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -176,9 +176,9 @@ require (
176176
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
177177
github.com/pkg/errors v0.9.1 // indirect
178178
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
179-
github.com/prometheus/client_golang v1.23.0 // indirect
179+
github.com/prometheus/client_golang v1.23.2 // indirect
180180
github.com/prometheus/client_model v0.6.2 // indirect
181-
github.com/prometheus/common v0.65.0 // indirect
181+
github.com/prometheus/common v0.66.1 // indirect
182182
github.com/prometheus/procfs v0.17.0 // indirect
183183
github.com/rubenv/sql-migrate v1.8.0 // indirect
184184
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -206,24 +206,24 @@ require (
206206
go.yaml.in/yaml/v3 v3.0.4 // indirect
207207
golang.org/x/crypto v0.42.0 // indirect
208208
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
209-
golang.org/x/net v0.44.0 // indirect
210-
golang.org/x/oauth2 v0.30.0 // indirect
209+
golang.org/x/net v0.45.0 // indirect
210+
golang.org/x/oauth2 v0.32.0 // indirect
211211
golang.org/x/sync v0.17.0 // indirect
212-
golang.org/x/sys v0.36.0 // indirect
212+
golang.org/x/sys v0.37.0 // indirect
213213
golang.org/x/term v0.35.0 // indirect
214-
golang.org/x/time v0.13.0 // indirect
214+
golang.org/x/time v0.14.0 // indirect
215215
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
216-
google.golang.org/api v0.248.0 // indirect
216+
google.golang.org/api v0.252.0 // indirect
217217
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
218-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
219-
google.golang.org/grpc v1.75.0 // indirect
220-
google.golang.org/protobuf v1.36.8 // indirect
218+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect
219+
google.golang.org/grpc v1.75.1 // indirect
220+
google.golang.org/protobuf v1.36.10 // indirect
221221
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
222222
gopkg.in/inf.v0 v0.9.1 // indirect
223223
gopkg.in/yaml.v3 v3.0.1 // indirect
224224
gotest.tools/v3 v3.4.0 // indirect
225-
k8s.io/apiserver v0.34.0 // indirect
226-
k8s.io/component-base v0.34.0 // indirect
225+
k8s.io/apiserver v0.34.1 // indirect
226+
k8s.io/component-base v0.34.1 // indirect
227227
k8s.io/klog/v2 v2.130.1 // indirect
228228
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
229229
oras.land/oras-go/v2 v2.6.0 // indirect

0 commit comments

Comments
 (0)