Skip to content

Commit 53c01a7

Browse files
Merge pull request #1301 from nutanix-cloud-native/nutanix-multi-subnets
CORS-3741: [Nutanix] support multi-subnets in Machine providerSpec
2 parents 227a541 + 77d34ff commit 53c01a7

File tree

112 files changed

+14139
-11321
lines changed

Some content is hidden

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

112 files changed

+14139
-11321
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/google/uuid v1.6.0
1212
github.com/onsi/ginkgo/v2 v2.20.2
1313
github.com/onsi/gomega v1.34.2
14-
github.com/openshift/api v0.0.0-20240924155631-232984653385
14+
github.com/openshift/api v0.0.0-20241118215836-09b63162bb15
1515
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd
1616
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20241007145816-7038c320d36c
1717
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240909043600-373ac49835bf

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4
371371
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
372372
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
373373
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
374-
github.com/openshift/api v0.0.0-20240924155631-232984653385 h1:P6O191HwBj0ahEfea2wkvxhmW2fzXhvCh8hwHDvUozM=
375-
github.com/openshift/api v0.0.0-20240924155631-232984653385/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
374+
github.com/openshift/api v0.0.0-20241118215836-09b63162bb15 h1:5bt8CBbXv1iSmBNCBXugsIT04NgHFCSkM1mOyuE8s2Q=
375+
github.com/openshift/api v0.0.0-20241118215836-09b63162bb15/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
376376
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd h1:Gd0+bYdcfGIsDOJ8BwTJJjQeXoziyIsTwqp/s38rKyM=
377377
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd/go.mod h1:EB7GeA/vpf9AHklMgnnT0+uG6l/3f8cChtCFbJFrk4g=
378378
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20241007145816-7038c320d36c h1:9A/0QoTZo2xh5j6nmh5CGNVBG8Ql1RmXmCcrikBnG+w=

install/0000_30_machine-api-operator_02_machine.CustomNoUpgrade.crd.yaml

Lines changed: 258 additions & 217 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_02_machine.Default.crd.yaml

Lines changed: 240 additions & 192 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_02_machine.DevPreviewNoUpgrade.crd.yaml

Lines changed: 240 additions & 192 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_02_machine.TechPreviewNoUpgrade.crd.yaml

Lines changed: 240 additions & 192 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_03_machineset.CustomNoUpgrade.crd.yaml

Lines changed: 323 additions & 305 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_03_machineset.Default.crd.yaml

Lines changed: 296 additions & 265 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_03_machineset.DevPreviewNoUpgrade.crd.yaml

Lines changed: 296 additions & 265 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_03_machineset.TechPreviewNoUpgrade.crd.yaml

Lines changed: 296 additions & 265 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)