Skip to content

Commit 148e5dc

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1256 from theobarberbany/bump-api
OCPCLOUD-2565: Bump openshift/api
2 parents ce3ebe5 + 5727c94 commit 148e5dc

File tree

305 files changed

+14390
-2615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+14390
-2615
lines changed

‎go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ module github.com/openshift/machine-api-operator
22

33
go 1.22.0
44

5-
toolchain go1.22.1
5+
toolchain go1.22.3
66

77
require (
88
github.com/blang/semver v3.5.1+incompatible
99
github.com/go-logr/logr v1.4.1
10-
github.com/google/uuid v1.4.0
10+
github.com/google/uuid v1.6.0
1111
github.com/onsi/ginkgo/v2 v2.17.1
1212
github.com/onsi/gomega v1.32.0
13-
github.com/openshift/api v0.0.0-20240521141249-8af21b7ed3e3
14-
github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e
13+
github.com/openshift/api v0.0.0-20240530053948-b01900f1982a
14+
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
1515
github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c
1616
github.com/prometheus/client_golang v1.18.0
1717
github.com/spf13/cobra v1.8.0
1818
github.com/spf13/pflag v1.0.5
19-
github.com/stretchr/testify v1.8.4
20-
github.com/vmware/govmomi v0.34.2
19+
github.com/stretchr/testify v1.9.0
20+
github.com/vmware/govmomi v0.37.2
2121
golang.org/x/net v0.24.0
2222
gopkg.in/gcfg.v1 v1.2.3 // indirect
2323
k8s.io/api v0.30.1
2424
k8s.io/apimachinery v0.30.1
2525
k8s.io/apiserver v0.30.1
2626
k8s.io/client-go v0.30.1
27-
k8s.io/cloud-provider-vsphere v1.28.0
27+
k8s.io/cloud-provider-vsphere v1.30.1
2828
k8s.io/klog/v2 v2.120.1
2929
k8s.io/kubectl v0.30.0
30-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
30+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
3131
sigs.k8s.io/cluster-api v1.6.1
3232
sigs.k8s.io/controller-runtime v0.18.3
3333
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240522175850-2e9781e9fc60
@@ -36,7 +36,7 @@ require (
3636

3737
require (
3838
github.com/golangci/golangci-lint v1.52.2
39-
golang.org/x/time v0.3.0
39+
golang.org/x/time v0.5.0
4040
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
4141
)
4242

@@ -73,7 +73,7 @@ require (
7373
github.com/daixiang0/gci v0.10.1 // indirect
7474
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7575
github.com/denis-tingaikin/go-header v0.4.3 // indirect
76-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
76+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
7777
github.com/esimonov/ifshort v1.0.4 // indirect
7878
github.com/ettle/strcase v0.1.1 // indirect
7979
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
@@ -88,9 +88,9 @@ require (
8888
github.com/go-critic/go-critic v0.7.0 // indirect
8989
github.com/go-errors/errors v1.4.2 // indirect
9090
github.com/go-logr/zapr v1.3.0 // indirect
91-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
92-
github.com/go-openapi/jsonreference v0.20.2 // indirect
93-
github.com/go-openapi/swag v0.22.3 // indirect
91+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
92+
github.com/go-openapi/jsonreference v0.21.0 // indirect
93+
github.com/go-openapi/swag v0.23.0 // indirect
9494
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
9595
github.com/go-toolsmith/astcast v1.1.0 // indirect
9696
github.com/go-toolsmith/astcopy v1.1.0 // indirect
@@ -216,7 +216,7 @@ require (
216216
github.com/spf13/viper v1.17.0 // indirect
217217
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
218218
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
219-
github.com/stretchr/objx v0.5.0 // indirect
219+
github.com/stretchr/objx v0.5.2 // indirect
220220
github.com/subosito/gotenv v1.6.0 // indirect
221221
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
222222
github.com/tdakkota/asciicheck v0.2.0 // indirect
@@ -237,15 +237,15 @@ require (
237237
go.uber.org/zap v1.26.0 // indirect
238238
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
239239
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
240-
golang.org/x/mod v0.15.0 // indirect
241-
golang.org/x/oauth2 v0.14.0 // indirect
240+
golang.org/x/mod v0.16.0 // indirect
241+
golang.org/x/oauth2 v0.18.0 // indirect
242242
golang.org/x/sync v0.6.0 // indirect
243243
golang.org/x/sys v0.19.0 // indirect
244244
golang.org/x/term v0.19.0 // indirect
245245
golang.org/x/text v0.14.0 // indirect
246-
golang.org/x/tools v0.18.0 // indirect
246+
golang.org/x/tools v0.19.0 // indirect
247247
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
248-
google.golang.org/appengine v1.6.7 // indirect
248+
google.golang.org/appengine v1.6.8 // indirect
249249
google.golang.org/protobuf v1.33.0 // indirect
250250
gopkg.in/inf.v0 v0.9.1 // indirect
251251
gopkg.in/ini.v1 v1.67.0 // indirect

‎go.sum

Lines changed: 37 additions & 36 deletions
Large diffs are not rendered by default.

‎hack/crds-sync.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
set -euo pipefail
44

55
# map names of CRD files between the vendored openshift/api repository and the ./install directory
6-
CRDS_MAPPING=( "vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines.crd.yaml:0000_30_machine-api-operator_02_machine.crd.yaml"
7-
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets.crd.yaml:0000_30_machine-api-operator_03_machineset.crd.yaml"
8-
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinehealthchecks.crd.yaml:0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml")
6+
CRDS_MAPPING=(
7+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-Default.crd.yaml:0000_30_machine-api-operator_02_machine.Default.crd.yaml"
8+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-CustomNoUpgrade.crd.yaml:0000_30_machine-api-operator_02_machine.CustomNoUpgrade.crd.yaml"
9+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-DevPreviewNoUpgrade.crd.yaml:0000_30_machine-api-operator_02_machine.DevPreviewNoUpgrade.crd.yaml"
10+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-TechPreviewNoUpgrade.crd.yaml:0000_30_machine-api-operator_02_machine.TechPreviewNoUpgrade.crd.yaml"
11+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-Default.crd.yaml:0000_30_machine-api-operator_03_machineset.Default.crd.yaml"
12+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-CustomNoUpgrade.crd.yaml:0000_30_machine-api-operator_03_machineset.CustomNoUpgrade.crd.yaml"
13+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-DevPreviewNoUpgrade.crd.yaml:0000_30_machine-api-operator_03_machineset.DevPreviewNoUpgrade.crd.yaml"
14+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-TechPreviewNoUpgrade.crd.yaml:0000_30_machine-api-operator_03_machineset.TechPreviewNoUpgrade.crd.yaml"
15+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinehealthchecks.crd.yaml:0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml"
16+
)
917

1018
for crd in "${CRDS_MAPPING[@]}" ; do
1119
SRC="${crd%%:*}"

0 commit comments

Comments
 (0)