Skip to content

Commit cb29e49

Browse files
author
shiftstack-merge-bot
committed
CARRY: running make merge-bot
1 parent 388d403 commit cb29e49

File tree

10 files changed

+46
-45
lines changed

10 files changed

+46
-45
lines changed

‎hack/codegen/vendor/modules.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ gopkg.in/yaml.v2
834834
# gopkg.in/yaml.v3 v3.0.1
835835
## explicit
836836
gopkg.in/yaml.v3
837-
# k8s.io/api v0.30.13
837+
# k8s.io/api v0.30.14
838838
## explicit; go 1.22.0
839839
k8s.io/api/admission/v1
840840
k8s.io/api/admission/v1beta1
@@ -892,7 +892,7 @@ k8s.io/api/storage/v1
892892
k8s.io/api/storage/v1alpha1
893893
k8s.io/api/storage/v1beta1
894894
k8s.io/api/storagemigration/v1alpha1
895-
# k8s.io/apiextensions-apiserver v0.30.13
895+
# k8s.io/apiextensions-apiserver v0.30.14
896896
## explicit; go 1.22.0
897897
k8s.io/apiextensions-apiserver/pkg/apihelpers
898898
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
@@ -913,7 +913,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
913913
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
914914
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
915915
k8s.io/apiextensions-apiserver/pkg/features
916-
# k8s.io/apimachinery v0.30.13
916+
# k8s.io/apimachinery v0.30.14
917917
## explicit; go 1.22.0
918918
k8s.io/apimachinery/pkg/api/apitesting
919919
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
@@ -974,7 +974,7 @@ k8s.io/apimachinery/pkg/version
974974
k8s.io/apimachinery/pkg/watch
975975
k8s.io/apimachinery/third_party/forked/golang/json
976976
k8s.io/apimachinery/third_party/forked/golang/reflect
977-
# k8s.io/apiserver v0.30.13
977+
# k8s.io/apiserver v0.30.14
978978
## explicit; go 1.22.0
979979
k8s.io/apiserver/pkg/admission
980980
k8s.io/apiserver/pkg/apis/apiserver
@@ -1037,7 +1037,7 @@ k8s.io/apiserver/pkg/warning
10371037
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
10381038
k8s.io/apiserver/plugin/pkg/authorizer/webhook
10391039
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
1040-
# k8s.io/client-go v0.30.13
1040+
# k8s.io/client-go v0.30.14
10411041
## explicit; go 1.22.0
10421042
k8s.io/client-go/applyconfigurations/admissionregistration/v1
10431043
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -1301,7 +1301,7 @@ k8s.io/client-go/util/workqueue
13011301
## explicit; go 1.22.0
13021302
k8s.io/cluster-bootstrap/token/api
13031303
k8s.io/cluster-bootstrap/token/util
1304-
# k8s.io/code-generator v0.30.13 => k8s.io/code-generator v0.30.0-alpha.3.0.20240618021310-030791bd8d60
1304+
# k8s.io/code-generator v0.30.14 => k8s.io/code-generator v0.30.0-alpha.3.0.20240618021310-030791bd8d60
13051305
## explicit; go 1.22.0
13061306
k8s.io/code-generator
13071307
k8s.io/code-generator/cmd/applyconfiguration-gen
@@ -1337,7 +1337,7 @@ k8s.io/code-generator/cmd/register-gen/generators
13371337
k8s.io/code-generator/pkg/namer
13381338
k8s.io/code-generator/pkg/util
13391339
k8s.io/code-generator/third_party/forked/golang/reflect
1340-
# k8s.io/component-base v0.30.13
1340+
# k8s.io/component-base v0.30.14
13411341
## explicit; go 1.22.0
13421342
k8s.io/component-base/cli/flag
13431343
k8s.io/component-base/featuregate

‎hack/tools/vendor/modules.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ gopkg.in/yaml.v2
657657
# gopkg.in/yaml.v3 v3.0.1
658658
## explicit
659659
gopkg.in/yaml.v3
660-
# k8s.io/api v0.31.9
660+
# k8s.io/api v0.31.10
661661
## explicit; go 1.22.0
662662
k8s.io/api/admission/v1
663663
k8s.io/api/admission/v1beta1
@@ -716,12 +716,12 @@ k8s.io/api/storage/v1
716716
k8s.io/api/storage/v1alpha1
717717
k8s.io/api/storage/v1beta1
718718
k8s.io/api/storagemigration/v1alpha1
719-
# k8s.io/apiextensions-apiserver v0.31.9
719+
# k8s.io/apiextensions-apiserver v0.31.10
720720
## explicit; go 1.22.0
721721
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
722722
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
723723
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
724-
# k8s.io/apimachinery v0.31.9
724+
# k8s.io/apimachinery v0.31.10
725725
## explicit; go 1.22.0
726726
k8s.io/apimachinery/pkg/api/apitesting
727727
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
@@ -785,7 +785,7 @@ k8s.io/apimachinery/pkg/version
785785
k8s.io/apimachinery/pkg/watch
786786
k8s.io/apimachinery/third_party/forked/golang/json
787787
k8s.io/apimachinery/third_party/forked/golang/reflect
788-
# k8s.io/apiserver v0.31.9
788+
# k8s.io/apiserver v0.31.10
789789
## explicit; go 1.22.0
790790
k8s.io/apiserver/pkg/admission
791791
k8s.io/apiserver/pkg/apis/apiserver
@@ -846,7 +846,7 @@ k8s.io/apiserver/pkg/warning
846846
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
847847
k8s.io/apiserver/plugin/pkg/authorizer/webhook
848848
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
849-
# k8s.io/client-go v0.31.9
849+
# k8s.io/client-go v0.31.10
850850
## explicit; go 1.22.0
851851
k8s.io/client-go/applyconfigurations/admissionregistration/v1
852852
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -1116,7 +1116,7 @@ k8s.io/client-go/util/workqueue
11161116
## explicit; go 1.22.0
11171117
k8s.io/cluster-bootstrap/token/api
11181118
k8s.io/cluster-bootstrap/token/util
1119-
# k8s.io/code-generator v0.31.9
1119+
# k8s.io/code-generator v0.31.10
11201120
## explicit; go 1.22.0
11211121
k8s.io/code-generator
11221122
k8s.io/code-generator/cmd/applyconfiguration-gen
@@ -1152,7 +1152,7 @@ k8s.io/code-generator/cmd/register-gen/generators
11521152
k8s.io/code-generator/pkg/namer
11531153
k8s.io/code-generator/pkg/util
11541154
k8s.io/code-generator/third_party/forked/golang/reflect
1155-
# k8s.io/component-base v0.31.9
1155+
# k8s.io/component-base v0.31.10
11561156
## explicit; go 1.22.0
11571157
k8s.io/component-base/cli/flag
11581158
k8s.io/component-base/featuregate

‎hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/.trivyignore

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/Makefile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/netlify.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openshift/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/onsi/gomega v1.36.2
1212
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6
1313
github.com/openshift/cluster-capi-operator/e2e v0.0.0-20241031122839-87f4fd28a59e
14-
k8s.io/api v0.30.13
15-
k8s.io/apimachinery v0.30.13
16-
k8s.io/client-go v0.30.13
14+
k8s.io/api v0.30.14
15+
k8s.io/apimachinery v0.30.14
16+
k8s.io/client-go v0.30.14
1717
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
1818
sigs.k8s.io/cluster-api v1.8.12
1919
sigs.k8s.io/cluster-api-provider-openstack v0.8.0
@@ -75,7 +75,7 @@ require (
7575
gopkg.in/inf.v0 v0.9.1 // indirect
7676
gopkg.in/yaml.v2 v2.4.0 // indirect
7777
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.30.13 // indirect
78+
k8s.io/apiextensions-apiserver v0.30.14 // indirect
7979
k8s.io/klog/v2 v2.130.1 // indirect
8080
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
8181
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎openshift/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
180180
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
181181
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
182182
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
183-
k8s.io/api v0.30.13 h1:sMd35sT564/4WbYC6zgd647T8BCFd/RQ/grjZ/SRILQ=
184-
k8s.io/api v0.30.13/go.mod h1:zC1tsa1wA83tgU2TvmNPDhoma8sdPZUSMybXXKXlV9Y=
185-
k8s.io/apiextensions-apiserver v0.30.13 h1:kOdHt09yVtHYtUPmY2EVpq3yropPFW+LEsp4fepQtWE=
186-
k8s.io/apiextensions-apiserver v0.30.13/go.mod h1:o84TU4UcbG7oT+2aUjsihUDH3GyRk0Ix65ppux5oTF0=
187-
k8s.io/apimachinery v0.30.13 h1:k/GhLdHZZcmjsJNnSSPpTcwh+JObsCrKcZpHUbUolhU=
188-
k8s.io/apimachinery v0.30.13/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
189-
k8s.io/client-go v0.30.13 h1:yCO7SUSdra5oDvtiQOZSVbUePpmSIa1CuqOBucfLJOQ=
190-
k8s.io/client-go v0.30.13/go.mod h1:EC2CFt174JSlnAAYxmwFNLPCiczbZaZMNdgQlLxvOAg=
183+
k8s.io/api v0.30.14 h1:iPq9YNOz1vHcSuN9YTmRUt8iPpB1cYPxxjgbY25xfS4=
184+
k8s.io/api v0.30.14/go.mod h1:IdrH4AiKc2bqDDb1FAfwcP1pPRmDdyRIqNk4K8KkEoc=
185+
k8s.io/apiextensions-apiserver v0.30.14 h1:7hi4CMq9EVT4vjdFpDZ/E1yOqhfU5IDHl2M8bexjA4s=
186+
k8s.io/apiextensions-apiserver v0.30.14/go.mod h1:NHLlcx7YmhxktP+eBfjxYPmsfnmsBU2Ue3/ytHzAHJE=
187+
k8s.io/apimachinery v0.30.14 h1:2OvEYwWoWeb25+xzFGP/8gChu+MfRNv24BlCQdnfGzQ=
188+
k8s.io/apimachinery v0.30.14/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
189+
k8s.io/client-go v0.30.14 h1:D81QZvBtv897JU4HRsx4YoaCDnzeZSvB8eApgmbtXVA=
190+
k8s.io/client-go v0.30.14/go.mod h1:9ytP3kKzrz3ZWavlWih4NB0mTdYA0DB1ElBHimq+JqQ=
191191
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
192192
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
193193
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a h1:zD1uj3Jf+mD4zmA7W+goE5TxDkI7OGJjBNBzq5fJtLA=

‎openshift/vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ gopkg.in/yaml.v2
348348
# gopkg.in/yaml.v3 v3.0.1
349349
## explicit
350350
gopkg.in/yaml.v3
351-
# k8s.io/api v0.30.13
351+
# k8s.io/api v0.30.14
352352
## explicit; go 1.22.0
353353
k8s.io/api/admission/v1
354354
k8s.io/api/admission/v1beta1
@@ -406,11 +406,11 @@ k8s.io/api/storage/v1
406406
k8s.io/api/storage/v1alpha1
407407
k8s.io/api/storage/v1beta1
408408
k8s.io/api/storagemigration/v1alpha1
409-
# k8s.io/apiextensions-apiserver v0.30.13
409+
# k8s.io/apiextensions-apiserver v0.30.14
410410
## explicit; go 1.22.0
411411
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
412412
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
413-
# k8s.io/apimachinery v0.30.13
413+
# k8s.io/apimachinery v0.30.14
414414
## explicit; go 1.22.0
415415
k8s.io/apimachinery/pkg/api/equality
416416
k8s.io/apimachinery/pkg/api/errors
@@ -461,7 +461,7 @@ k8s.io/apimachinery/pkg/version
461461
k8s.io/apimachinery/pkg/watch
462462
k8s.io/apimachinery/third_party/forked/golang/json
463463
k8s.io/apimachinery/third_party/forked/golang/reflect
464-
# k8s.io/client-go v0.30.13
464+
# k8s.io/client-go v0.30.14
465465
## explicit; go 1.22.0
466466
k8s.io/client-go/applyconfigurations/admissionregistration/v1
467467
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1

‎orc/hack/codegen/vendor/modules.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ gopkg.in/yaml.v2
503503
# gopkg.in/yaml.v3 v3.0.1
504504
## explicit
505505
gopkg.in/yaml.v3
506-
# k8s.io/api v0.30.13
506+
# k8s.io/api v0.30.14
507507
## explicit; go 1.22.0
508508
k8s.io/api/admission/v1
509509
k8s.io/api/admission/v1beta1
@@ -561,7 +561,7 @@ k8s.io/api/storage/v1
561561
k8s.io/api/storage/v1alpha1
562562
k8s.io/api/storage/v1beta1
563563
k8s.io/api/storagemigration/v1alpha1
564-
# k8s.io/apiextensions-apiserver v0.30.13
564+
# k8s.io/apiextensions-apiserver v0.30.14
565565
## explicit; go 1.22.0
566566
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
567567
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
@@ -572,7 +572,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
572572
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
573573
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
574574
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
575-
# k8s.io/apimachinery v0.30.13
575+
# k8s.io/apimachinery v0.30.14
576576
## explicit; go 1.22.0
577577
k8s.io/apimachinery/pkg/api/equality
578578
k8s.io/apimachinery/pkg/api/errors
@@ -629,7 +629,7 @@ k8s.io/apimachinery/pkg/version
629629
k8s.io/apimachinery/pkg/watch
630630
k8s.io/apimachinery/third_party/forked/golang/json
631631
k8s.io/apimachinery/third_party/forked/golang/reflect
632-
# k8s.io/apiserver v0.30.13
632+
# k8s.io/apiserver v0.30.14
633633
## explicit; go 1.22.0
634634
k8s.io/apiserver/pkg/apis/apiserver
635635
k8s.io/apiserver/pkg/apis/apiserver/install
@@ -673,7 +673,7 @@ k8s.io/apiserver/pkg/warning
673673
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
674674
k8s.io/apiserver/plugin/pkg/authorizer/webhook
675675
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
676-
# k8s.io/client-go v0.30.13
676+
# k8s.io/client-go v0.30.14
677677
## explicit; go 1.22.0
678678
k8s.io/client-go/applyconfigurations/admissionregistration/v1
679679
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -823,7 +823,7 @@ k8s.io/client-go/util/homedir
823823
k8s.io/client-go/util/keyutil
824824
k8s.io/client-go/util/retry
825825
k8s.io/client-go/util/workqueue
826-
# k8s.io/code-generator v0.30.13 => k8s.io/code-generator v0.30.0-alpha.3.0.20240618021310-030791bd8d60
826+
# k8s.io/code-generator v0.30.14 => k8s.io/code-generator v0.30.0-alpha.3.0.20240618021310-030791bd8d60
827827
## explicit; go 1.22.0
828828
k8s.io/code-generator
829829
k8s.io/code-generator/cmd/applyconfiguration-gen
@@ -859,7 +859,7 @@ k8s.io/code-generator/cmd/register-gen/generators
859859
k8s.io/code-generator/pkg/namer
860860
k8s.io/code-generator/pkg/util
861861
k8s.io/code-generator/third_party/forked/golang/reflect
862-
# k8s.io/component-base v0.30.13
862+
# k8s.io/component-base v0.30.14
863863
## explicit; go 1.22.0
864864
k8s.io/component-base/featuregate
865865
k8s.io/component-base/metrics

‎orc/vendor/modules.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ gopkg.in/yaml.v2
471471
# gopkg.in/yaml.v3 v3.0.1
472472
## explicit
473473
gopkg.in/yaml.v3
474-
# k8s.io/api v0.30.13
474+
# k8s.io/api v0.30.14
475475
## explicit; go 1.22.0
476476
k8s.io/api/admission/v1
477477
k8s.io/api/admission/v1beta1
@@ -529,7 +529,7 @@ k8s.io/api/storage/v1
529529
k8s.io/api/storage/v1alpha1
530530
k8s.io/api/storage/v1beta1
531531
k8s.io/api/storagemigration/v1alpha1
532-
# k8s.io/apiextensions-apiserver v0.30.13
532+
# k8s.io/apiextensions-apiserver v0.30.14
533533
## explicit; go 1.22.0
534534
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
535535
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
@@ -540,7 +540,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
540540
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
541541
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
542542
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
543-
# k8s.io/apimachinery v0.30.13
543+
# k8s.io/apimachinery v0.30.14
544544
## explicit; go 1.22.0
545545
k8s.io/apimachinery/pkg/api/equality
546546
k8s.io/apimachinery/pkg/api/errors
@@ -597,7 +597,7 @@ k8s.io/apimachinery/pkg/version
597597
k8s.io/apimachinery/pkg/watch
598598
k8s.io/apimachinery/third_party/forked/golang/json
599599
k8s.io/apimachinery/third_party/forked/golang/reflect
600-
# k8s.io/apiserver v0.30.13
600+
# k8s.io/apiserver v0.30.14
601601
## explicit; go 1.22.0
602602
k8s.io/apiserver/pkg/apis/apiserver
603603
k8s.io/apiserver/pkg/apis/apiserver/install
@@ -641,7 +641,7 @@ k8s.io/apiserver/pkg/warning
641641
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
642642
k8s.io/apiserver/plugin/pkg/authorizer/webhook
643643
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
644-
# k8s.io/client-go v0.30.13
644+
# k8s.io/client-go v0.30.14
645645
## explicit; go 1.22.0
646646
k8s.io/client-go/applyconfigurations/admissionregistration/v1
647647
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -791,7 +791,7 @@ k8s.io/client-go/util/homedir
791791
k8s.io/client-go/util/keyutil
792792
k8s.io/client-go/util/retry
793793
k8s.io/client-go/util/workqueue
794-
# k8s.io/component-base v0.30.13
794+
# k8s.io/component-base v0.30.14
795795
## explicit; go 1.22.0
796796
k8s.io/component-base/featuregate
797797
k8s.io/component-base/metrics

0 commit comments

Comments
 (0)