diff --git a/config/applyconfigurations/config/v1/vspherefailuredomainhostgroup.go b/config/applyconfigurations/config/v1/vspherefailuredomainhostgroup.go
new file mode 100644
index 000000000..f590263a1
--- /dev/null
+++ b/config/applyconfigurations/config/v1/vspherefailuredomainhostgroup.go
@@ -0,0 +1,41 @@
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v1
+
+// VSphereFailureDomainHostGroupApplyConfiguration represents a declarative configuration of the VSphereFailureDomainHostGroup type for use
+// with apply.
+type VSphereFailureDomainHostGroupApplyConfiguration struct {
+	VMGroup    *string `json:"vmGroup,omitempty"`
+	HostGroup  *string `json:"hostGroup,omitempty"`
+	VMHostRule *string `json:"vmHostRule,omitempty"`
+}
+
+// VSphereFailureDomainHostGroupApplyConfiguration constructs a declarative configuration of the VSphereFailureDomainHostGroup type for use with
+// apply.
+func VSphereFailureDomainHostGroup() *VSphereFailureDomainHostGroupApplyConfiguration {
+	return &VSphereFailureDomainHostGroupApplyConfiguration{}
+}
+
+// WithVMGroup sets the VMGroup field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the VMGroup field is set to the value of the last call.
+func (b *VSphereFailureDomainHostGroupApplyConfiguration) WithVMGroup(value string) *VSphereFailureDomainHostGroupApplyConfiguration {
+	b.VMGroup = &value
+	return b
+}
+
+// WithHostGroup sets the HostGroup field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the HostGroup field is set to the value of the last call.
+func (b *VSphereFailureDomainHostGroupApplyConfiguration) WithHostGroup(value string) *VSphereFailureDomainHostGroupApplyConfiguration {
+	b.HostGroup = &value
+	return b
+}
+
+// WithVMHostRule sets the VMHostRule field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the VMHostRule field is set to the value of the last call.
+func (b *VSphereFailureDomainHostGroupApplyConfiguration) WithVMHostRule(value string) *VSphereFailureDomainHostGroupApplyConfiguration {
+	b.VMHostRule = &value
+	return b
+}
diff --git a/config/applyconfigurations/config/v1/vspherefailuredomainregionaffinity.go b/config/applyconfigurations/config/v1/vspherefailuredomainregionaffinity.go
new file mode 100644
index 000000000..316e8e4d6
--- /dev/null
+++ b/config/applyconfigurations/config/v1/vspherefailuredomainregionaffinity.go
@@ -0,0 +1,27 @@
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v1
+
+import (
+	v1 "github.com/openshift/api/config/v1"
+)
+
+// VSphereFailureDomainRegionAffinityApplyConfiguration represents a declarative configuration of the VSphereFailureDomainRegionAffinity type for use
+// with apply.
+type VSphereFailureDomainRegionAffinityApplyConfiguration struct {
+	Type *v1.VSphereFailureDomainRegionType `json:"type,omitempty"`
+}
+
+// VSphereFailureDomainRegionAffinityApplyConfiguration constructs a declarative configuration of the VSphereFailureDomainRegionAffinity type for use with
+// apply.
+func VSphereFailureDomainRegionAffinity() *VSphereFailureDomainRegionAffinityApplyConfiguration {
+	return &VSphereFailureDomainRegionAffinityApplyConfiguration{}
+}
+
+// WithType sets the Type field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Type field is set to the value of the last call.
+func (b *VSphereFailureDomainRegionAffinityApplyConfiguration) WithType(value v1.VSphereFailureDomainRegionType) *VSphereFailureDomainRegionAffinityApplyConfiguration {
+	b.Type = &value
+	return b
+}
diff --git a/config/applyconfigurations/config/v1/vspherefailuredomainzoneaffinity.go b/config/applyconfigurations/config/v1/vspherefailuredomainzoneaffinity.go
new file mode 100644
index 000000000..a00c370f1
--- /dev/null
+++ b/config/applyconfigurations/config/v1/vspherefailuredomainzoneaffinity.go
@@ -0,0 +1,36 @@
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v1
+
+import (
+	v1 "github.com/openshift/api/config/v1"
+)
+
+// VSphereFailureDomainZoneAffinityApplyConfiguration represents a declarative configuration of the VSphereFailureDomainZoneAffinity type for use
+// with apply.
+type VSphereFailureDomainZoneAffinityApplyConfiguration struct {
+	Type      *v1.VSphereFailureDomainZoneType                 `json:"type,omitempty"`
+	HostGroup *VSphereFailureDomainHostGroupApplyConfiguration `json:"hostGroup,omitempty"`
+}
+
+// VSphereFailureDomainZoneAffinityApplyConfiguration constructs a declarative configuration of the VSphereFailureDomainZoneAffinity type for use with
+// apply.
+func VSphereFailureDomainZoneAffinity() *VSphereFailureDomainZoneAffinityApplyConfiguration {
+	return &VSphereFailureDomainZoneAffinityApplyConfiguration{}
+}
+
+// WithType sets the Type field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Type field is set to the value of the last call.
+func (b *VSphereFailureDomainZoneAffinityApplyConfiguration) WithType(value v1.VSphereFailureDomainZoneType) *VSphereFailureDomainZoneAffinityApplyConfiguration {
+	b.Type = &value
+	return b
+}
+
+// WithHostGroup sets the HostGroup field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the HostGroup field is set to the value of the last call.
+func (b *VSphereFailureDomainZoneAffinityApplyConfiguration) WithHostGroup(value *VSphereFailureDomainHostGroupApplyConfiguration) *VSphereFailureDomainZoneAffinityApplyConfiguration {
+	b.HostGroup = value
+	return b
+}
diff --git a/config/applyconfigurations/config/v1/vsphereplatformfailuredomainspec.go b/config/applyconfigurations/config/v1/vsphereplatformfailuredomainspec.go
index 1c5ec2cf1..aeb238882 100644
--- a/config/applyconfigurations/config/v1/vsphereplatformfailuredomainspec.go
+++ b/config/applyconfigurations/config/v1/vsphereplatformfailuredomainspec.go
@@ -5,11 +5,13 @@ package v1
 // VSpherePlatformFailureDomainSpecApplyConfiguration represents a declarative configuration of the VSpherePlatformFailureDomainSpec type for use
 // with apply.
 type VSpherePlatformFailureDomainSpecApplyConfiguration struct {
-	Name     *string                                    `json:"name,omitempty"`
-	Region   *string                                    `json:"region,omitempty"`
-	Zone     *string                                    `json:"zone,omitempty"`
-	Server   *string                                    `json:"server,omitempty"`
-	Topology *VSpherePlatformTopologyApplyConfiguration `json:"topology,omitempty"`
+	Name           *string                                               `json:"name,omitempty"`
+	Region         *string                                               `json:"region,omitempty"`
+	Zone           *string                                               `json:"zone,omitempty"`
+	RegionAffinity *VSphereFailureDomainRegionAffinityApplyConfiguration `json:"regionAffinity,omitempty"`
+	ZoneAffinity   *VSphereFailureDomainZoneAffinityApplyConfiguration   `json:"zoneAffinity,omitempty"`
+	Server         *string                                               `json:"server,omitempty"`
+	Topology       *VSpherePlatformTopologyApplyConfiguration            `json:"topology,omitempty"`
 }
 
 // VSpherePlatformFailureDomainSpecApplyConfiguration constructs a declarative configuration of the VSpherePlatformFailureDomainSpec type for use with
@@ -42,6 +44,22 @@ func (b *VSpherePlatformFailureDomainSpecApplyConfiguration) WithZone(value stri
 	return b
 }
 
+// WithRegionAffinity sets the RegionAffinity field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the RegionAffinity field is set to the value of the last call.
+func (b *VSpherePlatformFailureDomainSpecApplyConfiguration) WithRegionAffinity(value *VSphereFailureDomainRegionAffinityApplyConfiguration) *VSpherePlatformFailureDomainSpecApplyConfiguration {
+	b.RegionAffinity = value
+	return b
+}
+
+// WithZoneAffinity sets the ZoneAffinity field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the ZoneAffinity field is set to the value of the last call.
+func (b *VSpherePlatformFailureDomainSpecApplyConfiguration) WithZoneAffinity(value *VSphereFailureDomainZoneAffinityApplyConfiguration) *VSpherePlatformFailureDomainSpecApplyConfiguration {
+	b.ZoneAffinity = value
+	return b
+}
+
 // WithServer sets the Server field in the declarative configuration to the given value
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Server field is set to the value of the last call.
diff --git a/config/applyconfigurations/internal/internal.go b/config/applyconfigurations/internal/internal.go
index 55099fc98..e880fa8a6 100644
--- a/config/applyconfigurations/internal/internal.go
+++ b/config/applyconfigurations/internal/internal.go
@@ -3391,6 +3391,45 @@ var schemaYAML = typed.YAMLObject(`types:
       type:
         scalar: string
       default: ""
+- name: com.github.openshift.api.config.v1.VSphereFailureDomainHostGroup
+  map:
+    fields:
+    - name: hostGroup
+      type:
+        scalar: string
+      default: ""
+    - name: vmGroup
+      type:
+        scalar: string
+      default: ""
+    - name: vmHostRule
+      type:
+        scalar: string
+      default: ""
+- name: com.github.openshift.api.config.v1.VSphereFailureDomainRegionAffinity
+  map:
+    fields:
+    - name: type
+      type:
+        scalar: string
+      default: ""
+    unions:
+    - discriminator: type
+- name: com.github.openshift.api.config.v1.VSphereFailureDomainZoneAffinity
+  map:
+    fields:
+    - name: hostGroup
+      type:
+        namedType: com.github.openshift.api.config.v1.VSphereFailureDomainHostGroup
+    - name: type
+      type:
+        scalar: string
+      default: ""
+    unions:
+    - discriminator: type
+      fields:
+      - fieldName: hostGroup
+        discriminatorValue: HostGroup
 - name: com.github.openshift.api.config.v1.VSpherePlatformFailureDomainSpec
   map:
     fields:
@@ -3402,6 +3441,9 @@ var schemaYAML = typed.YAMLObject(`types:
       type:
         scalar: string
       default: ""
+    - name: regionAffinity
+      type:
+        namedType: com.github.openshift.api.config.v1.VSphereFailureDomainRegionAffinity
     - name: server
       type:
         scalar: string
@@ -3414,6 +3456,9 @@ var schemaYAML = typed.YAMLObject(`types:
       type:
         scalar: string
       default: ""
+    - name: zoneAffinity
+      type:
+        namedType: com.github.openshift.api.config.v1.VSphereFailureDomainZoneAffinity
 - name: com.github.openshift.api.config.v1.VSpherePlatformLoadBalancer
   map:
     fields:
diff --git a/config/applyconfigurations/utils.go b/config/applyconfigurations/utils.go
index a47035447..1e9f3f6d8 100644
--- a/config/applyconfigurations/utils.go
+++ b/config/applyconfigurations/utils.go
@@ -384,6 +384,12 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
 		return &configv1.UsernameClaimMappingApplyConfiguration{}
 	case v1.SchemeGroupVersion.WithKind("UsernamePrefix"):
 		return &configv1.UsernamePrefixApplyConfiguration{}
+	case v1.SchemeGroupVersion.WithKind("VSphereFailureDomainHostGroup"):
+		return &configv1.VSphereFailureDomainHostGroupApplyConfiguration{}
+	case v1.SchemeGroupVersion.WithKind("VSphereFailureDomainRegionAffinity"):
+		return &configv1.VSphereFailureDomainRegionAffinityApplyConfiguration{}
+	case v1.SchemeGroupVersion.WithKind("VSphereFailureDomainZoneAffinity"):
+		return &configv1.VSphereFailureDomainZoneAffinityApplyConfiguration{}
 	case v1.SchemeGroupVersion.WithKind("VSpherePlatformFailureDomainSpec"):
 		return &configv1.VSpherePlatformFailureDomainSpecApplyConfiguration{}
 	case v1.SchemeGroupVersion.WithKind("VSpherePlatformLoadBalancer"):
diff --git a/go.mod b/go.mod
index 5fa6b5e28..513f6d926 100644
--- a/go.mod
+++ b/go.mod
@@ -68,3 +68,9 @@ retract v3.9.0+incompatible
 // To make go aware of the retraction, we need to tag a new version that can be
 // retracted by itself.
 retract v0.0.1
+
+replace github.com/openshift/api => github.com/jcpowermac/api v0.0.0-20241030123604-ca48ada0adc2
+
+replace github.com/openshift/client-go => github.com/jcpowermac/client-go v0.0.0-20241025131701-73020f5b7d88
+
+replace github.com/openshift/library-go => github.com/jcpowermac/library-go v0.0.0-20241025125326-e6593037aea6
diff --git a/go.sum b/go.sum
index 8d005d0ca..9b4313bff 100644
--- a/go.sum
+++ b/go.sum
@@ -36,6 +36,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/jcpowermac/api v0.0.0-20241030123604-ca48ada0adc2 h1:yhtUn1RvKVfqPvWmRLqxAPbEyZNy9kVT+60icIWcGys=
+github.com/jcpowermac/api v0.0.0-20241030123604-ca48ada0adc2/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
index 0daa62d30..9e61caa81 100644
--- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
+++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
@@ -1162,8 +1162,30 @@ type VSpherePlatformLoadBalancer struct {
 	Type PlatformLoadBalancerType `json:"type,omitempty"`
 }
 
-// VSpherePlatformFailureDomainSpec holds the region and zone failure domain and
-// the vCenter topology of that failure domain.
+// The VSphereFailureDomainZoneType is a string representation of a failure domain
+// zone type. There are two supportable types HostGroup and ComputeCluster
+// +enum
+type VSphereFailureDomainZoneType string
+
+// The VSphereFailureDomainRegionType is a string representation of a failure domain
+// region type. There are two supportable types ComputeCluster and Datacenter
+// +enum
+type VSphereFailureDomainRegionType string
+
+const (
+	// HostGroupFailureDomainZone is a failure domain zone for a vCenter vm-host group.
+	HostGroupFailureDomainZone VSphereFailureDomainZoneType = "HostGroup"
+	// ComputeClusterFailureDomainZone is a failure domain zone for a vCenter compute cluster.
+	ComputeClusterFailureDomainZone VSphereFailureDomainZoneType = "ComputeCluster"
+	// DatacenterFailureDomainRegion is a failure domain region for a vCenter datacenter.
+	DatacenterFailureDomainRegion VSphereFailureDomainRegionType = "Datacenter"
+	// ComputeClusterFailureDomainRegion is a failure domain region for a vCenter compute cluster.
+	ComputeClusterFailureDomainRegion VSphereFailureDomainRegionType = "ComputeCluster"
+)
+
+// VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.
+// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereHostVMGroupZonal,rule="has(self.zoneAffinity) && self.zoneAffinity.type == 'HostGroup' ?  has(self.regionAffinity) && self.regionAffinity.type == 'ComputeCluster' : true",message="when zoneAffinity type is HostGroup, regionAffinity type must be ComputeCluster"
+// +openshift:validation:FeatureGateAwareXValidation:featureGate=VSphereHostVMGroupZonal,rule="has(self.zoneAffinity) && self.zoneAffinity.type == 'ComputeCluster' ?  has(self.regionAffinity) && self.regionAffinity.type == 'Datacenter' : true",message="when zoneAffinity type is ComputeCluster, regionAffinity type must be Datacenter"
 type VSpherePlatformFailureDomainSpec struct {
 	// name defines the arbitrary but unique name
 	// of a failure domain.
@@ -1188,6 +1210,21 @@ type VSpherePlatformFailureDomainSpec struct {
 	// +kubebuilder:validation:Required
 	Zone string `json:"zone"`
 
+	// regionAffinity holds the type of region, Datacenter or ComputeCluster.
+	// When set to Datacenter, this means the region is a vCenter Datacenter as defined in topology.
+	// When set to ComputeCluster, this means the region is a vCenter Cluster as defined in topology.
+	// +openshift:validation:featureGate=VSphereHostVMGroupZonal
+	// +optional
+	RegionAffinity *VSphereFailureDomainRegionAffinity `json:"regionAffinity,omitempty"`
+
+	// zoneAffinity holds the type of the zone and the hostGroup which
+	// vmGroup and the hostGroup names in vCenter corresponds to
+	// a vm-host group of type Virtual Machine and Host respectively. Is also
+	// contains the vmHostRule which is an affinity vm-host rule in vCenter.
+	// +openshift:validation:featureGate=VSphereHostVMGroupZonal
+	// +optional
+	ZoneAffinity *VSphereFailureDomainZoneAffinity `json:"zoneAffinity,omitempty"`
+
 	// server is the fully-qualified domain name or the IP address of the vCenter server.
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MinLength=1
@@ -1277,6 +1314,76 @@ type VSpherePlatformTopology struct {
 	Template string `json:"template,omitempty"`
 }
 
+// VSphereFailureDomainZoneAffinity contains the vCenter cluster vm-host group (virtual machine and host types)
+// and the vm-host affinity rule that together creates an affinity configuration for vm-host based zonal.
+// This configuration within vCenter creates the required association between a failure domain, virtual machines
+// and ESXi hosts to create a vm-host based zone.
+// +kubebuilder:validation:XValidation:rule="has(self.type) && self.type == 'HostGroup' ?  has(self.hostGroup.hostGroup) : !has(self.hostGroup) || !has(self.hostGroup.hostGroup)",message="hostGroup is required when type is HostGroup, and forbidden otherwise"
+// +kubebuilder:validation:XValidation:rule="has(self.type) && self.type == 'HostGroup' ?  has(self.hostGroup.vmGroup) :  !has(self.hostGroup) || !has(self.hostGroup.vmGroup)",message="vmGroup is required when type is HostGroup, and forbidden otherwise"
+// +kubebuilder:validation:XValidation:rule="has(self.type) && self.type == 'HostGroup' ?  has(self.hostGroup.vmHostRule) : !has(self.hostGroup) || !has(self.hostGroup.vmHostRule)",message="vmHostRule is required when type is HostGroup, and forbidden otherwise"
+// +union
+type VSphereFailureDomainZoneAffinity struct {
+	// type is the string representation of the VSphereFailureDomainZoneType with available options of
+	// ComputeCluster and HostGroup.
+	// When set to ComputeCluster, this means the vCenter cluster defined is the zone.
+	// When set to HostGroup, hostGroup must be configured with hostGroup, vmGroup and vmHostRule and
+	// this means the zone is defined by the grouping of those fields.
+	// +kubebuilder:validation:Enum:=HostGroup;ComputeCluster
+	// +kubebuilder:validation:MinLength=9
+	// +kubebuilder:validation:MaxLength=14
+	// +kubebuilder:validation:Type:=string
+	// +kubebuilder:validation:Required
+	// +unionDiscriminator
+	Type VSphereFailureDomainZoneType `json:"type"`
+
+	// hostGroup holds the vmGroup and the hostGroup names in vCenter
+	// corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also
+	// contains the vmHostRule which is an affinity vm-host rule in vCenter.
+	// +unionMember,optional
+	HostGroup *VSphereFailureDomainHostGroup `json:"hostGroup,omitempty"`
+}
+
+// VSphereFailureDomainRegionAffinity contains the region type and two currently
+// empty fields, datacenter and computeCluster for future use.
+// +union
+type VSphereFailureDomainRegionAffinity struct {
+	// type is the string representation of the VSphereFailureDomainRegionType with available options of
+	// Datacenter and ComputeCluster
+	// When set to ComputeCluster, this means the vCenter cluster defined is the zone.
+	// When set to HostGroup, hostGroup must be configured with hostGroup, vmGroup and vmHostRule and
+	// this means the zone is defined by the grouping of those fields.
+	// +kubebuilder:validation:MinLength=9
+	// +kubebuilder:validation:MaxLength=14
+	// +kubebuilder:validation:Enum:=ComputeCluster;Datacenter
+	// +kubebuilder:validation:Type:=string
+	// +kubebuilder:validation:Required
+	// +unionDiscriminator
+	Type VSphereFailureDomainRegionType `json:"type"`
+}
+
+// VSphereFailureDomainHostGroup holds the vmGroup and the hostGroup names in vCenter
+// corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also
+// contains the vmHostRule which is an affinity vm-host rule in vCenter.
+type VSphereFailureDomainHostGroup struct {
+	// vmGroup is the name of the vm-host group of type virtual machine within vCenter for this failure domain.
+	// vmGroup is limited to 80 characters.
+	// This field is required when the VSphereFailureDomain ZoneType is HostGroup
+	// +kubebuilder:validation:MaxLength=80
+	VMGroup string `json:"vmGroup"`
+
+	// 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 VSphereFailureDomain ZoneType is HostGroup
+	// +kubebuilder:validation:MaxLength=80
+	HostGroup string `json:"hostGroup"`
+
+	// vmHostRule is the name of the affinity vm-host rule within vCenter for this failure domain.
+	// vmHostRule is limited to 80 characters.
+	// This field is required when the VSphereFailureDomain ZoneType is HostGroup
+	// +kubebuilder:validation:MaxLength=80
+	VMHostRule string `json:"vmHostRule"`
+}
+
 // VSpherePlatformVCenterSpec stores the vCenter connection fields.
 // This is used by the vSphere CCM.
 type VSpherePlatformVCenterSpec struct {
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
index 1b7fa44aa..b013d4595 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
@@ -5827,9 +5827,72 @@ func (in *UsernamePrefix) DeepCopy() *UsernamePrefix {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VSphereFailureDomainHostGroup) DeepCopyInto(out *VSphereFailureDomainHostGroup) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VSphereFailureDomainHostGroup.
+func (in *VSphereFailureDomainHostGroup) DeepCopy() *VSphereFailureDomainHostGroup {
+	if in == nil {
+		return nil
+	}
+	out := new(VSphereFailureDomainHostGroup)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VSphereFailureDomainRegionAffinity) DeepCopyInto(out *VSphereFailureDomainRegionAffinity) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VSphereFailureDomainRegionAffinity.
+func (in *VSphereFailureDomainRegionAffinity) DeepCopy() *VSphereFailureDomainRegionAffinity {
+	if in == nil {
+		return nil
+	}
+	out := new(VSphereFailureDomainRegionAffinity)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VSphereFailureDomainZoneAffinity) DeepCopyInto(out *VSphereFailureDomainZoneAffinity) {
+	*out = *in
+	if in.HostGroup != nil {
+		in, out := &in.HostGroup, &out.HostGroup
+		*out = new(VSphereFailureDomainHostGroup)
+		**out = **in
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VSphereFailureDomainZoneAffinity.
+func (in *VSphereFailureDomainZoneAffinity) DeepCopy() *VSphereFailureDomainZoneAffinity {
+	if in == nil {
+		return nil
+	}
+	out := new(VSphereFailureDomainZoneAffinity)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *VSpherePlatformFailureDomainSpec) DeepCopyInto(out *VSpherePlatformFailureDomainSpec) {
 	*out = *in
+	if in.RegionAffinity != nil {
+		in, out := &in.RegionAffinity, &out.RegionAffinity
+		*out = new(VSphereFailureDomainRegionAffinity)
+		**out = **in
+	}
+	if in.ZoneAffinity != nil {
+		in, out := &in.ZoneAffinity, &out.ZoneAffinity
+		*out = new(VSphereFailureDomainZoneAffinity)
+		(*in).DeepCopyInto(*out)
+	}
 	in.Topology.DeepCopyInto(&out.Topology)
 	return
 }
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
index abfea5eaf..09f550aca 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -315,6 +315,7 @@ infrastructures.config.openshift.io:
   - GCPClusterHostedDNS
   - GCPLabelsTags
   - VSphereControlPlaneMachineSet
+  - VSphereHostVMGroupZonal
   - VSphereMultiNetworks
   - VSphereMultiVCenters
   FilenameOperatorName: config-operator
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
index 145a7e4c0..bb0c21a5d 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
@@ -1736,13 +1736,45 @@ func (PowerVSServiceEndpoint) SwaggerDoc() map[string]string {
 	return map_PowerVSServiceEndpoint
 }
 
+var map_VSphereFailureDomainHostGroup = map[string]string{
+	"":           "VSphereFailureDomainHostGroup holds the vmGroup and the hostGroup names in vCenter corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also contains the vmHostRule which is an affinity vm-host rule in vCenter.",
+	"vmGroup":    "vmGroup is the name of the vm-host group of type virtual machine within vCenter for this failure domain. vmGroup is limited to 80 characters. This field is required when the VSphereFailureDomain ZoneType is HostGroup",
+	"hostGroup":  "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 VSphereFailureDomain ZoneType is HostGroup",
+	"vmHostRule": "vmHostRule is the name of the affinity vm-host rule within vCenter for this failure domain. vmHostRule is limited to 80 characters. This field is required when the VSphereFailureDomain ZoneType is HostGroup",
+}
+
+func (VSphereFailureDomainHostGroup) SwaggerDoc() map[string]string {
+	return map_VSphereFailureDomainHostGroup
+}
+
+var map_VSphereFailureDomainRegionAffinity = map[string]string{
+	"":     "VSphereFailureDomainRegionAffinity contains the region type and two currently empty fields, datacenter and computeCluster for future use.",
+	"type": "type is the string representation of the VSphereFailureDomainRegionType with available options of Datacenter and ComputeCluster When set to ComputeCluster, this means the vCenter cluster defined is the zone. When set to HostGroup, hostGroup must be configured with hostGroup, vmGroup and vmHostRule and this means the zone is defined by the grouping of those fields.",
+}
+
+func (VSphereFailureDomainRegionAffinity) SwaggerDoc() map[string]string {
+	return map_VSphereFailureDomainRegionAffinity
+}
+
+var map_VSphereFailureDomainZoneAffinity = map[string]string{
+	"":          "VSphereFailureDomainZoneAffinity contains the vCenter cluster vm-host group (virtual machine and host types) and the vm-host affinity rule that together creates an affinity configuration for vm-host based zonal. This configuration within vCenter creates the required association between a failure domain, virtual machines and ESXi hosts to create a vm-host based zone.",
+	"type":      "type is the string representation of the VSphereFailureDomainZoneType with available options of ComputeCluster and HostGroup. When set to ComputeCluster, this means the vCenter cluster defined is the zone. When set to HostGroup, hostGroup must be configured with hostGroup, vmGroup and vmHostRule and this means the zone is defined by the grouping of those fields.",
+	"hostGroup": "hostGroup holds the vmGroup and the hostGroup names in vCenter corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also contains the vmHostRule which is an affinity vm-host rule in vCenter.",
+}
+
+func (VSphereFailureDomainZoneAffinity) SwaggerDoc() map[string]string {
+	return map_VSphereFailureDomainZoneAffinity
+}
+
 var map_VSpherePlatformFailureDomainSpec = map[string]string{
-	"":         "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.",
-	"name":     "name defines the arbitrary but unique name of a failure domain.",
-	"region":   "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.",
-	"zone":     "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.",
-	"server":   "server is the fully-qualified domain name or the IP address of the vCenter server.",
-	"topology": "Topology describes a given failure domain using vSphere constructs",
+	"":               "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.",
+	"name":           "name defines the arbitrary but unique name of a failure domain.",
+	"region":         "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.",
+	"zone":           "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.",
+	"regionAffinity": "regionAffinity holds the type of region, Datacenter or ComputeCluster. When set to Datacenter, this means the region is a vCenter Datacenter as defined in topology. When set to ComputeCluster, this means the region is a vCenter Cluster as defined in topology.",
+	"zoneAffinity":   "zoneAffinity holds the type of the zone and the hostGroup which vmGroup and the hostGroup names in vCenter corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also contains the vmHostRule which is an affinity vm-host rule in vCenter.",
+	"server":         "server is the fully-qualified domain name or the IP address of the vCenter server.",
+	"topology":       "Topology describes a given failure domain using vSphere constructs",
 }
 
 func (VSpherePlatformFailureDomainSpec) SwaggerDoc() map[string]string {
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go b/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
index f458cbf6e..f55839e06 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
@@ -190,6 +190,9 @@ type Workspace struct {
 	// ResourcePool is the resource pool in which VMs are created/located.
 	// +optional
 	ResourcePool string `gcfg:"resourcepool-path,omitempty" json:"resourcePool,omitempty"`
+	// VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal.
+	// +optional
+	VMGroup string `gcfg:"vmGroup,omitempty" json:"vmGroup,omitempty"`
 }
 
 // VSphereMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field.
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
index 5bba232bf..3c4cb90eb 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
@@ -822,6 +822,7 @@ var map_Workspace = map[string]string{
 	"folder":       "Folder is the folder in which VMs are created/located.",
 	"datastore":    "Datastore is the datastore in which VMs are created/located.",
 	"resourcePool": "ResourcePool is the resource pool in which VMs are created/located.",
+	"vmGroup":      "VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal.",
 }
 
 func (Workspace) SwaggerDoc() map[string]string {
diff --git a/vendor/github.com/openshift/api/openapi/openapi.json b/vendor/github.com/openshift/api/openapi/openapi.json
index 33384de2a..3a9f78826 100644
--- a/vendor/github.com/openshift/api/openapi/openapi.json
+++ b/vendor/github.com/openshift/api/openapi/openapi.json
@@ -10558,6 +10558,86 @@
         }
       }
     },
+    "com.github.openshift.api.config.v1.VSphereFailureDomainHostGroup": {
+      "description": "VSphereFailureDomainHostGroup holds the vmGroup and the hostGroup names in vCenter corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also contains the vmHostRule which is an affinity vm-host rule in vCenter.",
+      "type": "object",
+      "required": [
+        "vmGroup",
+        "hostGroup",
+        "vmHostRule"
+      ],
+      "properties": {
+        "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 VSphereFailureDomain ZoneType is HostGroup",
+          "type": "string",
+          "default": ""
+        },
+        "vmGroup": {
+          "description": "vmGroup is the name of the vm-host group of type virtual machine within vCenter for this failure domain. vmGroup is limited to 80 characters. This field is required when the VSphereFailureDomain ZoneType is HostGroup",
+          "type": "string",
+          "default": ""
+        },
+        "vmHostRule": {
+          "description": "vmHostRule is the name of the affinity vm-host rule within vCenter for this failure domain. vmHostRule is limited to 80 characters. This field is required when the VSphereFailureDomain ZoneType is HostGroup",
+          "type": "string",
+          "default": ""
+        }
+      }
+    },
+    "com.github.openshift.api.config.v1.VSphereFailureDomainRegionAffinity": {
+      "description": "VSphereFailureDomainRegionAffinity contains the region type and two currently empty fields, datacenter and computeCluster for future use.",
+      "type": "object",
+      "required": [
+        "type"
+      ],
+      "properties": {
+        "type": {
+          "description": "type is the string representation of the VSphereFailureDomainRegionType with available options of Datacenter and ComputeCluster When set to ComputeCluster, this means the vCenter cluster defined is the zone. When set to HostGroup, hostGroup must be configured with hostGroup, vmGroup and vmHostRule and this means the zone is defined by the grouping of those fields.\n\nPossible enum values:\n - `\"ComputeCluster\"` is a failure domain region for a vCenter compute cluster.\n - `\"Datacenter\"` is a failure domain region for a vCenter datacenter.",
+          "type": "string",
+          "default": "",
+          "enum": [
+            "ComputeCluster",
+            "Datacenter"
+          ]
+        }
+      },
+      "x-kubernetes-unions": [
+        {
+          "discriminator": "type",
+          "fields-to-discriminateBy": {}
+        }
+      ]
+    },
+    "com.github.openshift.api.config.v1.VSphereFailureDomainZoneAffinity": {
+      "description": "VSphereFailureDomainZoneAffinity contains the vCenter cluster vm-host group (virtual machine and host types) and the vm-host affinity rule that together creates an affinity configuration for vm-host based zonal. This configuration within vCenter creates the required association between a failure domain, virtual machines and ESXi hosts to create a vm-host based zone.",
+      "type": "object",
+      "required": [
+        "type"
+      ],
+      "properties": {
+        "hostGroup": {
+          "description": "hostGroup holds the vmGroup and the hostGroup names in vCenter corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also contains the vmHostRule which is an affinity vm-host rule in vCenter.",
+          "$ref": "#/definitions/com.github.openshift.api.config.v1.VSphereFailureDomainHostGroup"
+        },
+        "type": {
+          "description": "type is the string representation of the VSphereFailureDomainZoneType with available options of ComputeCluster and HostGroup. When set to ComputeCluster, this means the vCenter cluster defined is the zone. When set to HostGroup, hostGroup must be configured with hostGroup, vmGroup and vmHostRule and this means the zone is defined by the grouping of those fields.\n\nPossible enum values:\n - `\"ComputeCluster\"` is a failure domain zone for a vCenter compute cluster.\n - `\"HostGroup\"` is a failure domain zone for a vCenter vm-host group.",
+          "type": "string",
+          "default": "",
+          "enum": [
+            "ComputeCluster",
+            "HostGroup"
+          ]
+        }
+      },
+      "x-kubernetes-unions": [
+        {
+          "discriminator": "type",
+          "fields-to-discriminateBy": {
+            "hostGroup": "HostGroup"
+          }
+        }
+      ]
+    },
     "com.github.openshift.api.config.v1.VSpherePlatformFailureDomainSpec": {
       "description": "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.",
       "type": "object",
@@ -10579,6 +10659,10 @@
           "type": "string",
           "default": ""
         },
+        "regionAffinity": {
+          "description": "regionAffinity holds the type of region, Datacenter or ComputeCluster. When set to Datacenter, this means the region is a vCenter Datacenter as defined in topology. When set to ComputeCluster, this means the region is a vCenter Cluster as defined in topology.",
+          "$ref": "#/definitions/com.github.openshift.api.config.v1.VSphereFailureDomainRegionAffinity"
+        },
         "server": {
           "description": "server is the fully-qualified domain name or the IP address of the vCenter server.",
           "type": "string",
@@ -10593,6 +10677,10 @@
           "description": "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.",
           "type": "string",
           "default": ""
+        },
+        "zoneAffinity": {
+          "description": "zoneAffinity holds the type of the zone and the hostGroup which vmGroup and the hostGroup names in vCenter corresponds to a vm-host group of type Virtual Machine and Host respectively. Is also contains the vmHostRule which is an affinity vm-host rule in vCenter.",
+          "$ref": "#/definitions/com.github.openshift.api.config.v1.VSphereFailureDomainZoneAffinity"
         }
       }
     },
@@ -22386,6 +22474,10 @@
         "server": {
           "description": "Server is the IP address or FQDN of the vSphere endpoint.",
           "type": "string"
+        },
+        "vmGroup": {
+          "description": "VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal.",
+          "type": "string"
         }
       }
     },
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 54e8f3074..f724fc515 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -488,3 +488,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
+# github.com/openshift/api => github.com/jcpowermac/api v0.0.0-20241030123604-ca48ada0adc2
+# github.com/openshift/library-go => github.com/jcpowermac/library-go v0.0.0-20241025125326-e6593037aea6