Skip to content

Commit 02f3774

Browse files
shiftstack-merge-botEmilienM
shiftstack-merge-bot
authored and
EmilienM
committed
Updating and vendoring go modules after an upstream merge
1 parent 7a607c8 commit 02f3774

File tree

7 files changed

+47
-31
lines changed

7 files changed

+47
-31
lines changed

‎hack/tools/vendor/modules.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ gopkg.in/yaml.v2
658658
# gopkg.in/yaml.v3 v3.0.1
659659
## explicit
660660
gopkg.in/yaml.v3
661-
# k8s.io/api v0.31.6
661+
# k8s.io/api v0.31.7
662662
## explicit; go 1.22.0
663663
k8s.io/api/admission/v1
664664
k8s.io/api/admission/v1beta1
@@ -717,12 +717,12 @@ k8s.io/api/storage/v1
717717
k8s.io/api/storage/v1alpha1
718718
k8s.io/api/storage/v1beta1
719719
k8s.io/api/storagemigration/v1alpha1
720-
# k8s.io/apiextensions-apiserver v0.31.6
720+
# k8s.io/apiextensions-apiserver v0.31.7
721721
## explicit; go 1.22.0
722722
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
723723
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
724724
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
725-
# k8s.io/apimachinery v0.31.6
725+
# k8s.io/apimachinery v0.31.7
726726
## explicit; go 1.22.0
727727
k8s.io/apimachinery/pkg/api/apitesting
728728
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
@@ -786,7 +786,7 @@ k8s.io/apimachinery/pkg/version
786786
k8s.io/apimachinery/pkg/watch
787787
k8s.io/apimachinery/third_party/forked/golang/json
788788
k8s.io/apimachinery/third_party/forked/golang/reflect
789-
# k8s.io/apiserver v0.31.6
789+
# k8s.io/apiserver v0.31.7
790790
## explicit; go 1.22.0
791791
k8s.io/apiserver/pkg/admission
792792
k8s.io/apiserver/pkg/apis/apiserver
@@ -847,7 +847,7 @@ k8s.io/apiserver/pkg/warning
847847
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
848848
k8s.io/apiserver/plugin/pkg/authorizer/webhook
849849
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
850-
# k8s.io/client-go v0.31.6
850+
# k8s.io/client-go v0.31.7
851851
## explicit; go 1.22.0
852852
k8s.io/client-go/applyconfigurations/admissionregistration/v1
853853
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -1117,7 +1117,7 @@ k8s.io/client-go/util/workqueue
11171117
## explicit; go 1.22.0
11181118
k8s.io/cluster-bootstrap/token/api
11191119
k8s.io/cluster-bootstrap/token/util
1120-
# k8s.io/code-generator v0.31.6
1120+
# k8s.io/code-generator v0.31.7
11211121
## explicit; go 1.22.0
11221122
k8s.io/code-generator
11231123
k8s.io/code-generator/cmd/applyconfiguration-gen
@@ -1153,7 +1153,7 @@ k8s.io/code-generator/cmd/register-gen/generators
11531153
k8s.io/code-generator/pkg/namer
11541154
k8s.io/code-generator/pkg/util
11551155
k8s.io/code-generator/third_party/forked/golang/reflect
1156-
# k8s.io/component-base v0.31.6
1156+
# k8s.io/component-base v0.31.7
11571157
## explicit; go 1.22.0
11581158
k8s.io/component-base/cli/flag
11591159
k8s.io/component-base/featuregate

‎hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/controllers/openstackcluster_controller.go

Lines changed: 16 additions & 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/controllers/openstackserver_controller.go

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
@@ -9,9 +9,9 @@ require (
99
github.com/onsi/gomega v1.36.2
1010
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6
1111
github.com/openshift/cluster-capi-operator/e2e v0.0.0-20250123104340-ddf11cf94960
12-
k8s.io/api v0.31.6
13-
k8s.io/apimachinery v0.31.6
14-
k8s.io/client-go v0.31.6
12+
k8s.io/api v0.31.7
13+
k8s.io/apimachinery v0.31.7
14+
k8s.io/client-go v0.31.7
1515
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
1616
sigs.k8s.io/cluster-api v1.9.5
1717
sigs.k8s.io/cluster-api-provider-openstack v0.8.0
@@ -77,7 +77,7 @@ require (
7777
gopkg.in/inf.v0 v0.9.1 // indirect
7878
gopkg.in/yaml.v2 v2.4.0 // indirect
7979
gopkg.in/yaml.v3 v3.0.1 // indirect
80-
k8s.io/apiextensions-apiserver v0.31.6 // indirect
80+
k8s.io/apiextensions-apiserver v0.31.7 // indirect
8181
k8s.io/klog/v2 v2.130.1 // indirect
8282
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
8383
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
@@ -188,14 +188,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
188188
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
189189
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
190190
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
191-
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
192-
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
193-
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
194-
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
195-
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
196-
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
197-
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
198-
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
191+
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
192+
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
193+
k8s.io/apiextensions-apiserver v0.31.7 h1:FujQQl6iKuCF5nX4GIQy3ClvftU8MqadAyi9oQ6ZeAw=
194+
k8s.io/apiextensions-apiserver v0.31.7/go.mod h1:YmNzYECWFYy8n9R0oxtVAD9JYILZnZCNziYrpUQhKeI=
195+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
196+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
197+
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
198+
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
199199
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
200200
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
201201
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
@@ -367,7 +367,7 @@ gopkg.in/yaml.v2
367367
# gopkg.in/yaml.v3 v3.0.1
368368
## explicit
369369
gopkg.in/yaml.v3
370-
# k8s.io/api v0.31.6
370+
# k8s.io/api v0.31.7
371371
## explicit; go 1.22.0
372372
k8s.io/api/admission/v1
373373
k8s.io/api/admission/v1beta1
@@ -426,11 +426,11 @@ k8s.io/api/storage/v1
426426
k8s.io/api/storage/v1alpha1
427427
k8s.io/api/storage/v1beta1
428428
k8s.io/api/storagemigration/v1alpha1
429-
# k8s.io/apiextensions-apiserver v0.31.6
429+
# k8s.io/apiextensions-apiserver v0.31.7
430430
## explicit; go 1.22.0
431431
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
432432
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
433-
# k8s.io/apimachinery v0.31.6
433+
# k8s.io/apimachinery v0.31.7
434434
## explicit; go 1.22.0
435435
k8s.io/apimachinery/pkg/api/equality
436436
k8s.io/apimachinery/pkg/api/errors
@@ -484,7 +484,7 @@ k8s.io/apimachinery/pkg/version
484484
k8s.io/apimachinery/pkg/watch
485485
k8s.io/apimachinery/third_party/forked/golang/json
486486
k8s.io/apimachinery/third_party/forked/golang/reflect
487-
# k8s.io/client-go v0.31.6
487+
# k8s.io/client-go v0.31.7
488488
## explicit; go 1.22.0
489489
k8s.io/client-go/applyconfigurations/admissionregistration/v1
490490
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1

‎vendor/modules.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ gopkg.in/yaml.v2
841841
# gopkg.in/yaml.v3 v3.0.1
842842
## explicit
843843
gopkg.in/yaml.v3
844-
# k8s.io/api v0.31.6
844+
# k8s.io/api v0.31.7
845845
## explicit; go 1.22.0
846846
k8s.io/api/admission/v1
847847
k8s.io/api/admission/v1beta1
@@ -900,7 +900,7 @@ k8s.io/api/storage/v1
900900
k8s.io/api/storage/v1alpha1
901901
k8s.io/api/storage/v1beta1
902902
k8s.io/api/storagemigration/v1alpha1
903-
# k8s.io/apiextensions-apiserver v0.31.6
903+
# k8s.io/apiextensions-apiserver v0.31.7
904904
## explicit; go 1.22.0
905905
k8s.io/apiextensions-apiserver/pkg/apihelpers
906906
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
@@ -921,7 +921,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
921921
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
922922
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
923923
k8s.io/apiextensions-apiserver/pkg/features
924-
# k8s.io/apimachinery v0.31.6
924+
# k8s.io/apimachinery v0.31.7
925925
## explicit; go 1.22.0
926926
k8s.io/apimachinery/pkg/api/apitesting
927927
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
@@ -986,7 +986,7 @@ k8s.io/apimachinery/pkg/version
986986
k8s.io/apimachinery/pkg/watch
987987
k8s.io/apimachinery/third_party/forked/golang/json
988988
k8s.io/apimachinery/third_party/forked/golang/reflect
989-
# k8s.io/apiserver v0.31.6
989+
# k8s.io/apiserver v0.31.7
990990
## explicit; go 1.22.0
991991
k8s.io/apiserver/pkg/admission
992992
k8s.io/apiserver/pkg/apis/apiserver
@@ -1050,7 +1050,7 @@ k8s.io/apiserver/pkg/warning
10501050
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
10511051
k8s.io/apiserver/plugin/pkg/authorizer/webhook
10521052
k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
1053-
# k8s.io/client-go v0.31.6
1053+
# k8s.io/client-go v0.31.7
10541054
## explicit; go 1.22.0
10551055
k8s.io/client-go/applyconfigurations/admissionregistration/v1
10561056
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -1323,7 +1323,7 @@ k8s.io/client-go/util/workqueue
13231323
## explicit; go 1.22.0
13241324
k8s.io/cluster-bootstrap/token/api
13251325
k8s.io/cluster-bootstrap/token/util
1326-
# k8s.io/code-generator v0.31.6
1326+
# k8s.io/code-generator v0.31.7
13271327
## explicit; go 1.22.0
13281328
k8s.io/code-generator
13291329
k8s.io/code-generator/cmd/applyconfiguration-gen
@@ -1359,7 +1359,7 @@ k8s.io/code-generator/cmd/register-gen/generators
13591359
k8s.io/code-generator/pkg/namer
13601360
k8s.io/code-generator/pkg/util
13611361
k8s.io/code-generator/third_party/forked/golang/reflect
1362-
# k8s.io/component-base v0.31.6
1362+
# k8s.io/component-base v0.31.7
13631363
## explicit; go 1.22.0
13641364
k8s.io/component-base/cli/flag
13651365
k8s.io/component-base/featuregate

0 commit comments

Comments
 (0)