Skip to content

Commit 4ca98f7

Browse files
matheuscscpmatheuscscp
authored
Merge pull request #1938 from fluxcd/upgrade-deps
Upgrade k8s to 1.34.2, c-r to 0.22.4 and helm to 3.19.2
2 parents 05b26e8 + 561f785 commit 4ca98f7

File tree

4 files changed

+171
-171
lines changed

4 files changed

+171
-171
lines changed

‎api/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.25.0
44

55
require (
66
github.com/fluxcd/pkg/apis/acl v0.9.0
7-
github.com/fluxcd/pkg/apis/meta v1.22.0
8-
k8s.io/apimachinery v0.34.1
9-
sigs.k8s.io/controller-runtime v0.22.2
7+
github.com/fluxcd/pkg/apis/meta v1.23.0
8+
k8s.io/apimachinery v0.34.2
9+
sigs.k8s.io/controller-runtime v0.22.4
1010
)
1111

1212
require (

‎api/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ 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.22.0 h1:EHWQH5ZWml7i8eZ/AMjm1jxid3j/PQ31p+hIwCt6crM=
8-
github.com/fluxcd/pkg/apis/meta v1.22.0/go.mod h1:Kc1+bWe5p0doROzuV9XiTfV/oL3ddsemYXt8ZYWdVVg=
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=
@@ -100,14 +100,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
100100
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
101101
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
102102
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
103-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
104-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
103+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
104+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
105105
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
106106
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
107107
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
108108
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
109-
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
110-
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
109+
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
110+
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
111111
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
112112
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
113113
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

‎go.mod‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ require (
1212
cloud.google.com/go/compute/metadata v0.9.0
1313
cloud.google.com/go/storage v1.57.0
1414
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6
15-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
16-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0
17-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2
15+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0
16+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
17+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3
1818
github.com/Masterminds/semver/v3 v3.4.0
1919
github.com/cyphar/filepath-securejoin v0.6.0
2020
github.com/distribution/distribution/v3 v3.0.0
2121
github.com/docker/cli v28.5.0+incompatible
2222
github.com/docker/go-units v0.5.0
2323
github.com/elazarl/goproxy v1.7.2
2424
github.com/fluxcd/cli-utils v0.36.0-flux.15
25-
github.com/fluxcd/pkg/apis/event v0.20.0
26-
github.com/fluxcd/pkg/apis/meta v1.22.0
27-
github.com/fluxcd/pkg/artifact v0.4.0
28-
github.com/fluxcd/pkg/auth v0.32.0
25+
github.com/fluxcd/pkg/apis/event v0.21.0
26+
github.com/fluxcd/pkg/apis/meta v1.23.0
27+
github.com/fluxcd/pkg/artifact v0.5.0
28+
github.com/fluxcd/pkg/auth v0.33.0
2929
github.com/fluxcd/pkg/cache v0.12.0
30-
github.com/fluxcd/pkg/git v0.37.0
31-
github.com/fluxcd/pkg/git/gogit v0.41.0
32-
github.com/fluxcd/pkg/gittestserver v0.21.0
33-
github.com/fluxcd/pkg/helmtestserver v0.32.0
30+
github.com/fluxcd/pkg/git v0.38.0
31+
github.com/fluxcd/pkg/git/gogit v0.42.0
32+
github.com/fluxcd/pkg/gittestserver v0.22.0
33+
github.com/fluxcd/pkg/helmtestserver v0.33.0
3434
github.com/fluxcd/pkg/http/transport v0.7.0
3535
github.com/fluxcd/pkg/masktoken v0.8.0
36-
github.com/fluxcd/pkg/oci v0.57.0
37-
github.com/fluxcd/pkg/runtime v0.89.0
36+
github.com/fluxcd/pkg/oci v0.58.0
37+
github.com/fluxcd/pkg/runtime v0.90.0
3838
github.com/fluxcd/pkg/sourceignore v0.15.0
39-
github.com/fluxcd/pkg/ssh v0.22.0
40-
github.com/fluxcd/pkg/tar v0.15.0
39+
github.com/fluxcd/pkg/ssh v0.23.0
40+
github.com/fluxcd/pkg/tar v0.16.0
4141
github.com/fluxcd/pkg/testserver v0.13.0
4242
github.com/fluxcd/pkg/version v0.11.0
4343
github.com/fluxcd/source-controller/api v1.7.0
@@ -62,17 +62,17 @@ require (
6262
github.com/sigstore/sigstore v1.9.5
6363
github.com/sirupsen/logrus v1.9.3
6464
github.com/spf13/pflag v1.0.10
65-
golang.org/x/crypto v0.43.0
66-
golang.org/x/oauth2 v0.31.0
67-
golang.org/x/sync v0.17.0
68-
google.golang.org/api v0.252.0
69-
helm.sh/helm/v3 v3.19.1
70-
k8s.io/api v0.34.1
71-
k8s.io/apimachinery v0.34.1
72-
k8s.io/client-go v0.34.1
65+
golang.org/x/crypto v0.44.0
66+
golang.org/x/oauth2 v0.33.0
67+
golang.org/x/sync v0.18.0
68+
google.golang.org/api v0.256.0
69+
helm.sh/helm/v3 v3.19.2
70+
k8s.io/api v0.34.2
71+
k8s.io/apimachinery v0.34.2
72+
k8s.io/client-go v0.34.2
7373
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
7474
oras.land/oras-go/v2 v2.6.0
75-
sigs.k8s.io/controller-runtime v0.22.2
75+
sigs.k8s.io/controller-runtime v0.22.4
7676
sigs.k8s.io/yaml v1.6.0
7777
)
7878

@@ -99,7 +99,7 @@ require (
9999
github.com/Azure/go-autorest/logger v0.2.2 // indirect
100100
github.com/Azure/go-autorest/tracing v0.6.1 // indirect
101101
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
102-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
102+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
103103
github.com/BurntSushi/toml v1.5.0 // indirect
104104
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
105105
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
@@ -124,22 +124,22 @@ require (
124124
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
125125
github.com/aliyun/credentials-go v1.3.2 // indirect
126126
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
127-
github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
128-
github.com/aws/aws-sdk-go-v2/config v1.31.12 // indirect
129-
github.com/aws/aws-sdk-go-v2/credentials v1.18.16 // indirect
130-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
131-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
132-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
133-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
134-
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.5 // indirect
135-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.6 // indirect
136-
github.com/aws/aws-sdk-go-v2/service/eks v1.74.2 // indirect
137-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
138-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
139-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect
140-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect
141-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect
142-
github.com/aws/smithy-go v1.23.0 // indirect
127+
github.com/aws/aws-sdk-go-v2 v1.39.6 // indirect
128+
github.com/aws/aws-sdk-go-v2/config v1.31.20 // indirect
129+
github.com/aws/aws-sdk-go-v2/credentials v1.18.24 // indirect
130+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
131+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
132+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
133+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
134+
github.com/aws/aws-sdk-go-v2/service/ecr v1.52.0 // indirect
135+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.4 // indirect
136+
github.com/aws/aws-sdk-go-v2/service/eks v1.74.9 // indirect
137+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
138+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
139+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 // indirect
140+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 // indirect
141+
github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 // indirect
142+
github.com/aws/smithy-go v1.23.2 // indirect
143143
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.9.1 // indirect
144144
github.com/beorn7/perks v1.0.1 // indirect
145145
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -236,7 +236,7 @@ require (
236236
github.com/google/go-querystring v1.1.0 // indirect
237237
github.com/google/s2a-go v0.1.9 // indirect
238238
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
239-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
239+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
240240
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
241241
github.com/gorilla/handlers v1.5.2 // indirect
242242
github.com/gorilla/mux v1.8.1 // indirect
@@ -393,29 +393,29 @@ require (
393393
go.yaml.in/yaml/v2 v2.4.3 // indirect
394394
go.yaml.in/yaml/v3 v3.0.4 // indirect
395395
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
396-
golang.org/x/mod v0.28.0 // indirect
397-
golang.org/x/net v0.45.0 // indirect
398-
golang.org/x/sys v0.37.0 // indirect
399-
golang.org/x/term v0.36.0 // indirect
400-
golang.org/x/text v0.30.0 // indirect
401-
golang.org/x/time v0.13.0 // indirect
402-
golang.org/x/tools v0.37.0 // indirect
396+
golang.org/x/mod v0.29.0 // indirect
397+
golang.org/x/net v0.47.0 // indirect
398+
golang.org/x/sys v0.38.0 // indirect
399+
golang.org/x/term v0.37.0 // indirect
400+
golang.org/x/text v0.31.0 // indirect
401+
golang.org/x/time v0.14.0 // indirect
402+
golang.org/x/tools v0.38.0 // indirect
403403
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
404404
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
405405
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
406-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect
407-
google.golang.org/grpc v1.75.1 // indirect
406+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
407+
google.golang.org/grpc v1.76.0 // indirect
408408
google.golang.org/protobuf v1.36.10 // indirect
409409
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
410410
gopkg.in/inf.v0 v0.9.1 // indirect
411411
gopkg.in/ini.v1 v1.67.0 // indirect
412412
gopkg.in/warnings.v0 v0.1.2 // indirect
413413
gopkg.in/yaml.v2 v2.4.0 // indirect
414414
gopkg.in/yaml.v3 v3.0.1 // indirect
415-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
416-
k8s.io/apiserver v0.34.1 // indirect
415+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
416+
k8s.io/apiserver v0.34.2 // indirect
417417
k8s.io/cli-runtime v0.34.1 // indirect
418-
k8s.io/component-base v0.34.1 // indirect
418+
k8s.io/component-base v0.34.2 // indirect
419419
k8s.io/klog/v2 v2.130.1 // indirect
420420
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
421421
k8s.io/kubectl v0.34.1 // indirect

0 commit comments

Comments
 (0)