Skip to content

Commit 1a260c1

Browse files
hilmarfhilmarf
authored
Merge branch 'main' into dependabot/go_modules/go_modules-3464edad9a
2 parents 9f95098 + 34a9b92 commit 1a260c1

File tree

2 files changed

+30
-23
lines changed

2 files changed

+30
-23
lines changed

‎go.mod‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ replace github.com/texttheater/golang-levenshtein => github.com/texttheater/gola
1010
require (
1111
code.gitea.io/sdk/gitea v0.21.0
1212
github.com/fluxcd/cli-utils v0.36.0-flux.13
13-
github.com/fluxcd/flux2/v2 v2.6.2
13+
github.com/fluxcd/flux2/v2 v2.6.3
1414
github.com/fluxcd/helm-controller/api v1.3.0
15-
github.com/fluxcd/image-automation-controller/api v0.41.1
15+
github.com/fluxcd/image-automation-controller/api v0.41.2
1616
github.com/fluxcd/image-reflector-controller/api v0.35.2
1717
github.com/fluxcd/kustomize-controller/api v1.6.0
1818
github.com/fluxcd/notification-controller/api v1.6.0
1919
github.com/fluxcd/pkg/apis/meta v1.13.0
20-
github.com/fluxcd/pkg/runtime v0.60.0
20+
github.com/fluxcd/pkg/runtime v0.62.0
2121
github.com/fluxcd/pkg/ssa v0.48.0
2222
github.com/fluxcd/pkg/version v0.8.0
23-
github.com/fluxcd/source-controller/api v1.6.1
23+
github.com/fluxcd/source-controller/api v1.6.2
2424
github.com/open-component-model/git-controller v0.12.1
2525
github.com/open-component-model/ocm-controller v0.26.2
2626
github.com/open-component-model/replication-controller v0.13.1
@@ -32,8 +32,8 @@ require (
3232
ocm.software/ocm v0.25.0
3333
sigs.k8s.io/controller-runtime v0.21.0
3434
sigs.k8s.io/e2e-framework v0.6.0
35-
sigs.k8s.io/kustomize/api v0.19.0
36-
sigs.k8s.io/yaml v1.4.0
35+
sigs.k8s.io/kustomize/api v0.20.0
36+
sigs.k8s.io/yaml v1.5.0
3737
)
3838

3939
require (
@@ -104,6 +104,7 @@ require (
104104
github.com/buildkite/go-pipeline v0.13.3 // indirect
105105
github.com/buildkite/interpolate v0.1.5 // indirect
106106
github.com/buildkite/roko v1.3.1 // indirect
107+
github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
107108
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
108109
github.com/cespare/xxhash/v2 v2.3.0 // indirect
109110
github.com/chai2010/gettext-go v1.0.3 // indirect
@@ -194,7 +195,6 @@ require (
194195
github.com/google/go-github/v55 v55.0.0 // indirect
195196
github.com/google/go-querystring v1.1.0 // indirect
196197
github.com/google/s2a-go v0.1.9 // indirect
197-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
198198
github.com/google/uuid v1.6.0 // indirect
199199
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
200200
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
@@ -339,6 +339,8 @@ require (
339339
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
340340
go.uber.org/multierr v1.11.0 // indirect
341341
go.uber.org/zap v1.27.0 // indirect
342+
go.yaml.in/yaml/v2 v2.4.2 // indirect
343+
go.yaml.in/yaml/v3 v3.0.3 // indirect
342344
golang.org/x/crypto v0.39.0 // indirect
343345
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
344346
golang.org/x/mod v0.25.0 // indirect
@@ -370,7 +372,7 @@ require (
370372
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
371373
oras.land/oras-go/v2 v2.5.0 // indirect
372374
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
373-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
375+
sigs.k8s.io/kustomize/kyaml v0.20.0 // indirect
374376
sigs.k8s.io/randfill v1.0.0 // indirect
375377
sigs.k8s.io/release-utils v0.11.1 // indirect
376378
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect

‎go.sum‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ github.com/buildkite/interpolate v0.1.5 h1:v2Ji3voik69UZlbfoqzx+qfcsOKLA61nHdU79
221221
github.com/buildkite/interpolate v0.1.5/go.mod h1:dHnrwHew5O8VNOAgMDpwRlFnhL5VSN6M1bHVmRZ9Ccc=
222222
github.com/buildkite/roko v1.3.1 h1:t7K30ceLLYn6k7hQP4oq1c7dVlhgD5nRcuSRDEEnY1s=
223223
github.com/buildkite/roko v1.3.1/go.mod h1:23R9e6nHxgedznkwwfmqZ6+0VJZJZ2Sg/uVcp2cP46I=
224+
github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c=
225+
github.com/carapace-sh/carapace-shlex v1.0.1/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
224226
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
225227
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
226228
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -349,12 +351,12 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
349351
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
350352
github.com/fluxcd/cli-utils v0.36.0-flux.13 h1:2X5yjz/rk9mg7+bMFBDZKGKzeZpAmY2s6iwbNZz7OzM=
351353
github.com/fluxcd/cli-utils v0.36.0-flux.13/go.mod h1:b2iSoIeDTtjfCB0IKtGgqlhhvWa1oux3e90CjOf81oA=
352-
github.com/fluxcd/flux2/v2 v2.6.2 h1:P8DHoDnKqcywVcMqn1HARSwcgnqIydOQdWtHRvcsVuM=
353-
github.com/fluxcd/flux2/v2 v2.6.2/go.mod h1:Tq1aRCmNPgQ/UJkg9W6I++81/otb1E/3VfaotLXbwME=
354+
github.com/fluxcd/flux2/v2 v2.6.3 h1:pi2S2BJFfg3lURQ/q7WuOHaLhdPX3NhY0Pi66O4Epks=
355+
github.com/fluxcd/flux2/v2 v2.6.3/go.mod h1:H638p5YbIetl64wnpybeWf+NT3S273byQ9uHeNg1bnk=
354356
github.com/fluxcd/helm-controller/api v1.3.0 h1:PupXPuQbksmU0g2Lc6NjIYal2HJGL+6xohsf82eGVjo=
355357
github.com/fluxcd/helm-controller/api v1.3.0/go.mod h1:4b8PfdH0e/9Pfol2ogdMYbQ1nLjcVu9gAv27cQzIPK4=
356-
github.com/fluxcd/image-automation-controller/api v0.41.1 h1:zT0BN/LRqMzo4B53mM7ayAg73Ifh+th46H6TtQrB+7A=
357-
github.com/fluxcd/image-automation-controller/api v0.41.1/go.mod h1:TaCaXnDu0a6uWyF41WkyskH0gg6dFyniftvdCELcEKU=
358+
github.com/fluxcd/image-automation-controller/api v0.41.2 h1:miYjID4Mg51xcObVLQPRGkiWFYGpBSgItTXfQ4jVUVI=
359+
github.com/fluxcd/image-automation-controller/api v0.41.2/go.mod h1:TaCaXnDu0a6uWyF41WkyskH0gg6dFyniftvdCELcEKU=
358360
github.com/fluxcd/image-reflector-controller/api v0.35.2 h1:EzjtUpyx8kbTFx7ugdi5LRMaCpQW4kX/vjFCIPpPD38=
359361
github.com/fluxcd/image-reflector-controller/api v0.35.2/go.mod h1:mjpokoQhFs2RxfFjY4rHpn3ZAUvee8TiELyROFN4wiA=
360362
github.com/fluxcd/kustomize-controller/api v1.6.0 h1:8p230vpJy7giisoBNuI3CX99O+XKKVLLxXuJmv3sOHQ=
@@ -369,16 +371,16 @@ github.com/fluxcd/pkg/apis/meta v1.13.0 h1:KKYdXFzEmSuM8CP1Zqpt68IF+jqQILeiDiTmX
369371
github.com/fluxcd/pkg/apis/meta v1.13.0/go.mod h1:+son1Va60x2eiDcTwd7lcctbI6C+K3gM7R+ULmEq1SI=
370372
github.com/fluxcd/pkg/kustomize v1.18.0 h1:wWK+qYwmBmba3N3VAqZ9ijnfVGGaIjcaHWo033URZTw=
371373
github.com/fluxcd/pkg/kustomize v1.18.0/go.mod h1:Ij9722MdWIE6B1EPg2ZJUf6npycgfRfN4Lohi7D/Kic=
372-
github.com/fluxcd/pkg/runtime v0.60.0 h1:d++EkV3FlycB+bzakB5NumwY4J8xts8i7lbvD6jBLeU=
373-
github.com/fluxcd/pkg/runtime v0.60.0/go.mod h1:UeU0/eZLErYC/1bTmgzBfNXhiHy9fuQzjfLK0HxRgxY=
374+
github.com/fluxcd/pkg/runtime v0.62.0 h1:7/ZW4WgT23HDySqx+MRzefoh/1XlW9D/7siAlE20SQw=
375+
github.com/fluxcd/pkg/runtime v0.62.0/go.mod h1:7pxGvaU0Yy1cDIUhiHAHhCx2yCLnkcVsplbYZG6j4JY=
374376
github.com/fluxcd/pkg/ssa v0.48.0 h1:DW+4DG8L/yZEi30UltOEXPB1d/ZFn4HfVhpJQp5oc2o=
375377
github.com/fluxcd/pkg/ssa v0.48.0/go.mod h1:T50TO0U2obLodZnrFgOrxollfBEy4V673OkM2aTUF1c=
376378
github.com/fluxcd/pkg/tar v0.12.0 h1:og6F+ivnWNRbNJSq0ukCTVs7YrGIlzjxSVZU+E8NprM=
377379
github.com/fluxcd/pkg/tar v0.12.0/go.mod h1:Ra5Cj++MD5iCy7bZGKJJX3GpOeMPv+ZDkPO9bBwpDeU=
378380
github.com/fluxcd/pkg/version v0.8.0 h1:dA0EyXkQWDW/4nG71khXZXbl0gg5/8ZGWHF/O/3t13g=
379381
github.com/fluxcd/pkg/version v0.8.0/go.mod h1:V1OLccMojNC2O4LC+ZC9+18MtCy6m7pvINvPHNUn2rQ=
380-
github.com/fluxcd/source-controller/api v1.6.1 h1:ZPTA9lNzBYHmwHfFX978qb8xVkdnQZHF1ggo6BoFm4w=
381-
github.com/fluxcd/source-controller/api v1.6.1/go.mod h1:ZJcAi0nemsnBxjVgmJl0WQzNvB0rMETxQMTdoFosmMw=
382+
github.com/fluxcd/source-controller/api v1.6.2 h1:UmodAeqLIeF29HdTqf2GiacZyO+hJydJlepDaYsMvhc=
383+
github.com/fluxcd/source-controller/api v1.6.2/go.mod h1:ZJcAi0nemsnBxjVgmJl0WQzNvB0rMETxQMTdoFosmMw=
382384
github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI=
383385
github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
384386
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -524,8 +526,6 @@ github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J
524526
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
525527
github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
526528
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
527-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
528-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
529529
github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w=
530530
github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM=
531531
github.com/google/trillian v1.7.1 h1:+zX8jLM3524bAMPS+VxaDIDgsMv3/ty6DuLWerHXcek=
@@ -1023,6 +1023,10 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
10231023
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
10241024
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
10251025
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
1026+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
1027+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
1028+
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
1029+
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
10261030
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
10271031
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
10281032
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -1254,18 +1258,19 @@ sigs.k8s.io/e2e-framework v0.6.0 h1:p7hFzHnLKO7eNsWGI2AbC1Mo2IYxidg49BiT4njxkrM=
12541258
sigs.k8s.io/e2e-framework v0.6.0/go.mod h1:IREnCHnKgRCioLRmNi0hxSJ1kJ+aAdjEKK/gokcZu4k=
12551259
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
12561260
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
1257-
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
1258-
sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
1259-
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
1260-
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
1261+
sigs.k8s.io/kustomize/api v0.20.0 h1:xPLqcobHI0bThyRUteO+nCV8G4d1Rlo5HafO57VRcas=
1262+
sigs.k8s.io/kustomize/api v0.20.0/go.mod h1:F6CfaV27oevRCMJgehLqyX81dlUnRX/Fc13Uo7+OSo4=
1263+
sigs.k8s.io/kustomize/kyaml v0.20.0 h1:tT8KMKi4R3hCJ1+9HDdek2VoXpkerP92ZfF6fDgGw14=
1264+
sigs.k8s.io/kustomize/kyaml v0.20.0/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
12611265
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
12621266
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
12631267
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
12641268
sigs.k8s.io/release-utils v0.11.1 h1:hzvXGpHgHJfLOJB6TRuu14bzWc3XEglHmXHJqwClSZE=
12651269
sigs.k8s.io/release-utils v0.11.1/go.mod h1:ybR2V/uQAOGxYfzYtBenSYeXWkBGNP2qnEiX77ACtpc=
12661270
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
12671271
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
1268-
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
12691272
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
1273+
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
1274+
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
12701275
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
12711276
software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=

0 commit comments

Comments
 (0)