Skip to content

Commit

Permalink
Merge pull request #8873 from jcpowermac/SPLAT-1742
Browse files Browse the repository at this point in the history 
SPLAT-1742: vSphere - enable host group based zonal
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Jan 17, 2025
2 parents d9d3062 + a17d6ef commit 4fd9f0f
Show file tree
Hide file tree
Showing 122 changed files with 4,161 additions and 1,728 deletions.
60 changes: 51 additions & 9 deletions data/data/install.openshift.io_installconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ spec:
description: name is the resource name in the PC
type: string
type:
description: Type is the identifier type to use for
description: type is the identifier type to use for
this resource.
enum:
- uuid
Expand Down Expand Up @@ -1967,7 +1967,7 @@ spec:
description: name is the resource name in the PC
type: string
type:
description: Type is the identifier type to use for this
description: type is the identifier type to use for this
resource.
enum:
- uuid
Expand Down Expand Up @@ -4071,7 +4071,7 @@ spec:
description: name is the resource name in the PC
type: string
type:
description: Type is the identifier type to use for this
description: type is the identifier type to use for this
resource.
enum:
- uuid
Expand Down Expand Up @@ -5056,9 +5056,26 @@ spec:
type: string
region:
description: |-
region defines a FailureDomainCoordinate which
includes the name of the vCenter tag, the failure domain type
and the name of the vCenter tag category.
The region is the name of the tag in vCenter that is associated with the
tag category `openshift-region`. The region name must match the tag name
and must exist prior to installation. When the regionType is Datacenter
the tag must be attached to the toplogy.datacenter object in vCenter.
When the regionType is ComputeCluster the tag must be attached to the topology.computeCluster
object in vCenter.
type: string
regionType:
allOf:
- enum:
- HostGroup
- Datacenter
- ComputeCluster
- enum:
- Datacenter
- ComputeCluster
description: |-
regionType is the type of failure domain region, the current values are "Datacenter" and "ComputeCluster"
When regionType is Datacenter the zoneType must be ComputeCluster.
When regionType is ComputeCluster the zoneType must be HostGroup
type: string
server:
description: server is the fully-qualified domain name or
Expand Down Expand Up @@ -5099,6 +5116,13 @@ spec:
minLength: 1
pattern: ^/.*?/vm/.*?
type: string
hostGroup:
description: |-
hostGroup is the name of the vm-host group of type host within vCenter for this failure domain.
hostGroup is limited to 80 characters.
This field is required when the ZoneType is HostGroup
maxLength: 80
type: string
networks:
description: networks is the list of networks within
this failure domain
Expand Down Expand Up @@ -5136,9 +5160,27 @@ spec:
type: object
zone:
description: |-
zone defines a VSpherePlatformFailureDomain which
includes the name of the vCenter tag, the failure domain type
and the name of the vCenter tag category.
The zone is the name of the tag in vCenter that is associated with
the tag category `openshift-zone`. The zone name must match the tag name
and must exist prior to installation. When zoneType is HostGroup the
ESXi hosts defined in the provided in the topology.hostGroup field must be tagged.
When the zoneType is ComputeCluster the tag must be attached to the topology.computeCluster
object in vCenter.
type: string
zoneType:
allOf:
- enum:
- HostGroup
- Datacenter
- ComputeCluster
- enum:
- ComputeCluster
- HostGroup
description: |-
When zoneType is ComputeCluster the regionType must be Datacenter
When zoneType is HostGroup the regionType must be ComputeCluster
If the zoneType is HostGroup topology.hostGroup must be defined and exist in vCenter
prior to installation.
type: string
required:
- name
Expand Down
5 changes: 3 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ require (
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.3.3-0.20240416171357-98239ba02cb2
github.com/nutanix-cloud-native/prism-go-client v0.3.4
github.com/onsi/gomega v1.35.1
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429
github.com/openshift/api v0.0.0-20241216151652-de9de05a8e43
github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6
github.com/openshift/assisted-service/api v0.0.0
github.com/openshift/assisted-service/client v0.0.0
Expand All @@ -84,7 +84,7 @@ require (
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230308152226-83c0473d4429
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519
github.com/openshift/hive/apis v0.0.0-20231220215202-ad99b9e52d27
github.com/openshift/library-go v0.0.0-20241210171208-85e36bca7246
github.com/openshift/library-go v0.0.0-20241216140520-201d816c66f0
github.com/openshift/machine-api-provider-gcp v0.0.1-0.20241021180644-0eca0846914a
github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20231207164151-6b0b8ea7b16d
github.com/ovirt/go-ovirt v0.0.0-20210809163552-d4276e35d3db
Expand All @@ -104,6 +104,7 @@ require (
github.com/ulikunitz/xz v0.5.12
github.com/vincent-petithory/dataurl v1.0.0
github.com/vmware/govmomi v0.43.0
go.uber.org/mock v0.5.0
golang.org/x/crypto v0.31.0
golang.org/x/oauth2 v0.23.0
golang.org/x/sync v0.10.0
Expand Down
10 changes: 6 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429 h1:fz+u78YFRL14rXqBKWIVYK04mUOy6LccHe3wQsUS3iI=
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/api v0.0.0-20241216151652-de9de05a8e43 h1:3lcB5nqOOfsJzY4JD12AMKyg3+yQhAdJzNDenbmbMQg=
github.com/openshift/api v0.0.0-20241216151652-de9de05a8e43/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6 h1:U6ve+dnHlHhAELoxX+rdFOHVhoaYl0l9qtxwYtsO6C0=
github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6/go.mod h1:o2H5VwQhUD8P6XsK6dRmKpCCJqVvv12KJQZBXmcCXCU=
github.com/openshift/assisted-service v1.0.10-0.20230830164851-6573b5d7021d h1:CKw2Y4EdaFsMoqAdr2Tq0nlYTaaXmCRdP0gOu7pN64U=
Expand Down Expand Up @@ -808,8 +808,8 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
github.com/openshift/hive/apis v0.0.0-20231220215202-ad99b9e52d27 h1:9C86viyQl7HE9yg7Gctgx803Oq6DbrCUAberyMVcWDE=
github.com/openshift/hive/apis v0.0.0-20231220215202-ad99b9e52d27/go.mod h1:RRH8lt09SAiPECNdsbh7Gun0lkcRWi1nYKq6tDp5WxQ=
github.com/openshift/library-go v0.0.0-20241210171208-85e36bca7246 h1:HpUROtJipZRTCLLGlSrl+fwniNb9Z1q1trPOUFSXhvI=
github.com/openshift/library-go v0.0.0-20241210171208-85e36bca7246/go.mod h1:eGSI6tp7yUVr4V2d0WrVt2l5s3iCwAh8Hi0RC9Fo16U=
github.com/openshift/library-go v0.0.0-20241216140520-201d816c66f0 h1:LZ+/F23GNY0xyefWmAGecL/QBzZgxpf5cq6Nx19eFjU=
github.com/openshift/library-go v0.0.0-20241216140520-201d816c66f0/go.mod h1:eGSI6tp7yUVr4V2d0WrVt2l5s3iCwAh8Hi0RC9Fo16U=
github.com/openshift/machine-api-operator v0.2.1-0.20240930121047-57b7917e6140 h1:VKn644y4Ra94L8YZ3JT8ZuOZMEspZt8yoIjHeaRM3pA=
github.com/openshift/machine-api-operator v0.2.1-0.20240930121047-57b7917e6140/go.mod h1:JEUa45hXYbC6tDpLjJCRuLXIKs7pdcawDkodqfZuQEE=
github.com/openshift/machine-api-provider-gcp v0.0.1-0.20241021180644-0eca0846914a h1:2/DQryD6yCabqVtYLELnsrzX8SLUuGJEABvHrd4x5/U=
Expand Down Expand Up @@ -998,6 +998,8 @@ go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpK
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
Expand Down
1 change: 1 addition & 0 deletions pkg/asset/installconfig/vsphere/mock/vsphere_sim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func StartSimulator(setVersionToSupported bool) (*simulator.Server, error) {
model.ServiceContent.About.Version = vcenter7U2Version
}

model.ClusterHost = 6
model.Folder = 1
model.Datacenter = 5
model.OpaqueNetwork = 1
Expand Down
Loading

0 comments on commit 4fd9f0f

Please sign in to comment.