Skip to content

Commit 04b021c

Browse files
matheuscscpmatheuscscp
authored
Merge pull request #1351 from fluxcd/backport-1350-to-release/v1.4.x
[release/v1.4.x] Upgrade k8s to 1.34.2, c-r to 0.22.4 and helm to 3.19.2
2 parents e1e3bc2 + 52f7190 commit 04b021c

File tree

4 files changed

+171
-173
lines changed

4 files changed

+171
-173
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.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
6+
github.com/fluxcd/pkg/apis/kustomize v1.14.0
7+
github.com/fluxcd/pkg/apis/meta v1.23.0
8+
k8s.io/apiextensions-apiserver v0.34.2
9+
k8s.io/apimachinery v0.34.2
10+
sigs.k8s.io/controller-runtime v0.22.4
1111
sigs.k8s.io/yaml v1.6.0
1212
)
1313

@@ -16,7 +16,7 @@ require (
1616
github.com/go-logr/logr v1.4.3 // indirect
1717
github.com/gogo/protobuf v1.3.2 // indirect
1818
github.com/json-iterator/go v1.1.12 // indirect
19-
github.com/kr/pretty v0.3.1 // indirect
19+
github.com/kr/text v0.2.0 // indirect
2020
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2121
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
2222
github.com/spf13/pflag v1.0.7 // indirect

‎api/go.sum‎

Lines changed: 12 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.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=
5+
github.com/fluxcd/pkg/apis/kustomize v1.14.0 h1:PmWqMpRX0v7/aCAUNWfohe4o1qa9G3Cg/vVr5PCedI4=
6+
github.com/fluxcd/pkg/apis/kustomize v1.14.0/go.mod h1:CGRpU9Od4ht5+MHL6QlMfWaW87U9UTfGVM5CM4PZ28I=
7+
github.com/fluxcd/pkg/apis/meta v1.23.0 h1:fLis5YcHnOsyKYptzBtituBm5EWNx13I0bXQsy0FG4s=
8+
github.com/fluxcd/pkg/apis/meta v1.23.0/go.mod h1:UWsIbBPCxYvoVklr2mV2uLFBf/n17dNAmKFjRfApdDo=
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=
@@ -37,10 +37,8 @@ github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg
3737
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
3838
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
3939
github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
40-
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
4140
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4241
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
43-
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
4442
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
4543
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
4644
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
@@ -97,18 +95,18 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
9795
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
9896
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9997
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
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=
98+
k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
99+
k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
100+
k8s.io/apiextensions-apiserver v0.34.2 h1:WStKftnGeoKP4AZRz/BaAAEJvYp4mlZGN0UCv+uvsqo=
101+
k8s.io/apiextensions-apiserver v0.34.2/go.mod h1:398CJrsgXF1wytdaanynDpJ67zG4Xq7yj91GrmYN2SE=
102+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
103+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
106104
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
107105
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
108106
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=
109107
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
110-
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
111-
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
108+
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
109+
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
112110
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
113111
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
114112
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

‎go.mod‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ require (
1919
github.com/fluxcd/cli-utils v0.36.0-flux.15
2020
github.com/fluxcd/helm-controller/api v1.4.3
2121
github.com/fluxcd/pkg/apis/acl v0.9.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
22+
github.com/fluxcd/pkg/apis/event v0.21.0
23+
github.com/fluxcd/pkg/apis/kustomize v1.14.0
24+
github.com/fluxcd/pkg/apis/meta v1.23.0
25+
github.com/fluxcd/pkg/auth v0.33.0
2626
github.com/fluxcd/pkg/cache v0.12.0
27-
github.com/fluxcd/pkg/chartutil v1.16.0
28-
github.com/fluxcd/pkg/runtime v0.88.0
29-
github.com/fluxcd/pkg/ssa v0.60.0
27+
github.com/fluxcd/pkg/chartutil v1.17.0
28+
github.com/fluxcd/pkg/runtime v0.90.0
29+
github.com/fluxcd/pkg/ssa v0.61.0
3030
github.com/fluxcd/pkg/testserver v0.13.0
3131
github.com/fluxcd/source-controller/api v1.7.2
3232
github.com/go-logr/logr v1.4.3
@@ -40,18 +40,18 @@ require (
4040
github.com/spf13/pflag v1.0.10
4141
github.com/wI2L/jsondiff v0.7.0
4242
go.uber.org/zap v1.27.0
43-
golang.org/x/text v0.30.0
44-
helm.sh/helm/v3 v3.19.1
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
51-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
52-
sigs.k8s.io/controller-runtime v0.22.2
53-
sigs.k8s.io/kustomize/api v0.20.1
54-
sigs.k8s.io/kustomize/kyaml v0.20.1
43+
golang.org/x/text v0.31.0
44+
helm.sh/helm/v3 v3.19.2
45+
k8s.io/api v0.34.2
46+
k8s.io/apiextensions-apiserver v0.34.2
47+
k8s.io/apimachinery v0.34.2
48+
k8s.io/cli-runtime v0.34.2
49+
k8s.io/client-go v0.34.2
50+
k8s.io/kubectl v0.34.2
51+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
52+
sigs.k8s.io/controller-runtime v0.22.4
53+
sigs.k8s.io/kustomize/api v0.21.0
54+
sigs.k8s.io/kustomize/kyaml v0.21.0
5555
sigs.k8s.io/yaml v1.6.0
5656
)
5757

@@ -61,36 +61,36 @@ require (
6161
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
6262
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.1 // indirect
65-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 // indirect
64+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 // indirect
65+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // 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.5.0 // indirect
70+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.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.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
84-
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.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
88-
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.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
93-
github.com/aws/smithy-go v1.23.0 // indirect
78+
github.com/aws/aws-sdk-go-v2 v1.39.6 // indirect
79+
github.com/aws/aws-sdk-go-v2/config v1.31.20 // indirect
80+
github.com/aws/aws-sdk-go-v2/credentials v1.18.24 // indirect
81+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
82+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
83+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
84+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/ecr v1.52.0 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.4 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/eks v1.74.9 // indirect
88+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
89+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
90+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 // indirect
93+
github.com/aws/smithy-go v1.23.2 // indirect
9494
github.com/beorn7/perks v1.0.1 // indirect
9595
github.com/blang/semver/v4 v4.0.0 // indirect
9696
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -137,7 +137,7 @@ require (
137137
github.com/google/go-containerregistry v0.20.6 // indirect
138138
github.com/google/s2a-go v0.1.9 // indirect
139139
github.com/google/uuid v1.6.0 // indirect
140-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
140+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
141141
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
142142
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
143143
github.com/gosuri/uitable v0.0.4 // indirect
@@ -202,28 +202,28 @@ require (
202202
go.opentelemetry.io/otel/metric v1.38.0 // indirect
203203
go.opentelemetry.io/otel/trace v1.38.0 // indirect
204204
go.uber.org/multierr v1.11.0 // indirect
205-
go.yaml.in/yaml/v2 v2.4.2 // indirect
205+
go.yaml.in/yaml/v2 v2.4.3 // indirect
206206
go.yaml.in/yaml/v3 v3.0.4 // indirect
207-
golang.org/x/crypto v0.43.0 // indirect
207+
golang.org/x/crypto v0.44.0 // indirect
208208
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
209-
golang.org/x/net v0.45.0 // indirect
210-
golang.org/x/oauth2 v0.32.0 // indirect
211-
golang.org/x/sync v0.17.0 // indirect
212-
golang.org/x/sys v0.37.0 // indirect
213-
golang.org/x/term v0.36.0 // indirect
209+
golang.org/x/net v0.47.0 // indirect
210+
golang.org/x/oauth2 v0.33.0 // indirect
211+
golang.org/x/sync v0.18.0 // indirect
212+
golang.org/x/sys v0.38.0 // indirect
213+
golang.org/x/term v0.37.0 // indirect
214214
golang.org/x/time v0.14.0 // indirect
215215
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
216-
google.golang.org/api v0.252.0 // indirect
216+
google.golang.org/api v0.256.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-20251002232023-7c0ddcbb5797 // indirect
219-
google.golang.org/grpc v1.75.1 // indirect
218+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
219+
google.golang.org/grpc v1.76.0 // indirect
220220
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.1 // indirect
226-
k8s.io/component-base v0.34.1 // indirect
225+
k8s.io/apiserver v0.34.2 // indirect
226+
k8s.io/component-base v0.34.2 // 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)