Skip to content

Commit c4784b8

Browse files
authored
Merge pull request #1551 from fluxcd/upgrade-deps
Upgrade k8s to 1.34.2 and c-r to 0.22.4
2 parents cf42b7f + 2c21573 commit c4784b8

File tree

4 files changed

+169
-171
lines changed

4 files changed

+169
-171
lines changed

api/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ module github.com/fluxcd/kustomize-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
)
1212

1313
require (
1414
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
1515
github.com/go-logr/logr v1.4.3 // indirect
1616
github.com/gogo/protobuf v1.3.2 // indirect
1717
github.com/json-iterator/go v1.1.12 // indirect
18-
github.com/kr/pretty v0.3.1 // indirect
18+
github.com/kr/text v0.2.0 // indirect
1919
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2020
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
2121
github.com/x448/float16 v0.8.4 // 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.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
@@ -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-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
109107
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/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-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
113111
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/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
@@ -9,28 +9,28 @@ replace github.com/fluxcd/kustomize-controller/api => ./api
99
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
1010

1111
require (
12-
cloud.google.com/go/kms v1.23.1
12+
cloud.google.com/go/kms v1.23.2
1313
filippo.io/age v1.2.1
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/aws/aws-sdk-go-v2 v1.39.2
18-
github.com/aws/aws-sdk-go-v2/credentials v1.18.16
19-
github.com/cyphar/filepath-securejoin v0.4.1
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/aws/aws-sdk-go-v2 v1.39.6
18+
github.com/aws/aws-sdk-go-v2/credentials v1.18.24
19+
github.com/cyphar/filepath-securejoin v0.6.0
2020
github.com/dimchansky/utfbom v1.1.1
2121
github.com/fluxcd/cli-utils v0.36.0-flux.15
2222
github.com/fluxcd/kustomize-controller/api v1.7.0
2323
github.com/fluxcd/pkg/apis/acl v0.9.0
24-
github.com/fluxcd/pkg/apis/event v0.20.0
25-
github.com/fluxcd/pkg/apis/kustomize v1.13.0
26-
github.com/fluxcd/pkg/apis/meta v1.22.0
27-
github.com/fluxcd/pkg/auth v0.32.0
24+
github.com/fluxcd/pkg/apis/event v0.21.0
25+
github.com/fluxcd/pkg/apis/kustomize v1.14.0
26+
github.com/fluxcd/pkg/apis/meta v1.23.0
27+
github.com/fluxcd/pkg/auth v0.33.0
2828
github.com/fluxcd/pkg/cache v0.12.0
29-
github.com/fluxcd/pkg/http/fetch v0.20.0
30-
github.com/fluxcd/pkg/kustomize v1.23.0
31-
github.com/fluxcd/pkg/runtime v0.88.0
32-
github.com/fluxcd/pkg/ssa v0.60.0
33-
github.com/fluxcd/pkg/tar v0.15.0
29+
github.com/fluxcd/pkg/http/fetch v0.21.0
30+
github.com/fluxcd/pkg/kustomize v1.24.0
31+
github.com/fluxcd/pkg/runtime v0.90.0
32+
github.com/fluxcd/pkg/ssa v0.61.0
33+
github.com/fluxcd/pkg/tar v0.16.0
3434
github.com/fluxcd/pkg/testserver v0.13.0
3535
github.com/fluxcd/source-controller/api v1.7.2
3636
github.com/getsops/sops/v3 v3.11.0
@@ -40,14 +40,14 @@ require (
4040
github.com/opencontainers/go-digest v1.0.0
4141
github.com/ory/dockertest/v3 v3.12.0
4242
github.com/spf13/pflag v1.0.10
43-
golang.org/x/net v0.45.0
44-
golang.org/x/oauth2 v0.32.0
45-
k8s.io/api v0.34.1
46-
k8s.io/apimachinery v0.34.1
47-
k8s.io/client-go v0.34.1
48-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
49-
sigs.k8s.io/controller-runtime v0.22.2
50-
sigs.k8s.io/kustomize/api v0.20.1
43+
golang.org/x/net v0.47.0
44+
golang.org/x/oauth2 v0.33.0
45+
k8s.io/api v0.34.2
46+
k8s.io/apimachinery v0.34.2
47+
k8s.io/client-go v0.34.2
48+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
49+
sigs.k8s.io/controller-runtime v0.22.4
50+
sigs.k8s.io/kustomize/api v0.21.0
5151
sigs.k8s.io/yaml v1.6.0
5252
)
5353

@@ -78,7 +78,7 @@ require (
7878
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 // indirect
7979
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
8080
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
81-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
81+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
8282
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
8383
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
8484
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
@@ -88,26 +88,26 @@ require (
8888
github.com/ProtonMail/go-crypto v1.3.0 // indirect
8989
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
9090
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
91-
github.com/aws/aws-sdk-go-v2/config v1.31.12 // indirect
92-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
91+
github.com/aws/aws-sdk-go-v2/config v1.31.20 // indirect
92+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
9393
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.9 // indirect
94-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
94+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
9797
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.5 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.6 // indirect
100-
github.com/aws/aws-sdk-go-v2/service/eks v1.74.2 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/ecr v1.52.0 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.4 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/eks v1.74.9 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
102102
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.9 // indirect
103-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
103+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
104104
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.9 // indirect
105105
github.com/aws/aws-sdk-go-v2/service/kms v1.45.6 // indirect
106106
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.3 // indirect
107-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect
108-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect
109-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect
110-
github.com/aws/smithy-go v1.23.0 // indirect
107+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 // indirect
108+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 // indirect
109+
github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 // indirect
110+
github.com/aws/smithy-go v1.23.2 // indirect
111111
github.com/beorn7/perks v1.0.1 // indirect
112112
github.com/blang/semver v3.5.1+incompatible // indirect
113113
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -157,7 +157,7 @@ require (
157157
github.com/google/s2a-go v0.1.9 // indirect
158158
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
159159
github.com/google/uuid v1.6.0 // indirect
160-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
160+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
161161
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
162162
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
163163
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
@@ -233,33 +233,33 @@ require (
233233
go.uber.org/zap v1.27.0 // indirect
234234
go.yaml.in/yaml/v2 v2.4.2 // indirect
235235
go.yaml.in/yaml/v3 v3.0.4 // indirect
236-
golang.org/x/crypto v0.42.0 // indirect
236+
golang.org/x/crypto v0.44.0 // indirect
237237
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
238-
golang.org/x/sync v0.17.0 // indirect
239-
golang.org/x/sys v0.36.0 // indirect
240-
golang.org/x/term v0.35.0 // indirect
241-
golang.org/x/text v0.29.0 // indirect
242-
golang.org/x/time v0.13.0 // indirect
238+
golang.org/x/sync v0.18.0 // indirect
239+
golang.org/x/sys v0.38.0 // indirect
240+
golang.org/x/term v0.37.0 // indirect
241+
golang.org/x/text v0.31.0 // indirect
242+
golang.org/x/time v0.14.0 // indirect
243243
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
244-
google.golang.org/api v0.252.0 // indirect
244+
google.golang.org/api v0.256.0 // indirect
245245
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
246246
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
247-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect
248-
google.golang.org/grpc v1.75.1 // indirect
247+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
248+
google.golang.org/grpc v1.76.0 // indirect
249249
google.golang.org/protobuf v1.36.10 // indirect
250250
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
251251
gopkg.in/inf.v0 v0.9.1 // indirect
252252
gopkg.in/ini.v1 v1.67.0 // indirect
253253
gopkg.in/warnings.v0 v0.1.2 // indirect
254254
gopkg.in/yaml.v3 v3.0.1 // indirect
255-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
255+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
256256
k8s.io/cli-runtime v0.34.1 // indirect
257-
k8s.io/component-base v0.34.1 // indirect
257+
k8s.io/component-base v0.34.2 // indirect
258258
k8s.io/klog/v2 v2.130.1 // indirect
259259
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
260260
k8s.io/kubectl v0.34.1 // indirect
261261
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
262-
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
262+
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
263263
sigs.k8s.io/randfill v1.0.0 // indirect
264264
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
265265
)

0 commit comments

Comments
 (0)