openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

Merge pull request #10086 from jcpowermac/OCPBUGS-17667

Browse Source 
OCPBUGS-17667: Validate vCenter datacenters in failure domain topology
This commit is contained in:
openshift-merge-bot[bot]
2025-12-18 10:59:07 +00:00
committed by GitHub
parent b95e753045 64e5e4ed3f
commit 93ba4638d6
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/types/vsphere/validation/platform.go
View File

@@ -232,6 +232,8 @@ func validateFailureDomains(p *vsphere.Platform, platformFldPath *field.Path, fl
if len(failureDomain.Topology.Datacenter) == 0 {
allErrs = append(allErrs, field.Required(topologyFld.Child("datacenter"), "must specify a datacenter"))
} else if associatedVCenter != nil && len(associatedVCenter.Datacenters) > 0 && !slices.Contains(associatedVCenter.Datacenters, failureDomain.Topology.Datacenter) {
allErrs = append(allErrs, field.Invalid(topologyFld.Child("datacenter"), failureDomain.Topology.Datacenter, fmt.Sprintf("datacenter must be defined in vCenter %s datacenters list", failureDomain.Server)))
}
if len(failureDomain.Topology.Datastore) == 0 {
allErrs = append(allErrs, field.Required(topologyFld.Child("datastore"), "must specify a datastore"))

13
pkg/types/vsphere/validation/platform_test.go
View File

@@ -460,6 +460,19 @@ func TestValidatePlatform(t *testing.T) {
}(),
expectedError: `^test-path\.failureDomains\.server: Invalid value: "bad-vcenter": server does not exist in vcenters`,
},
{
name: "Multi-zone platform datacenter not in vCenter datacenters list",
platform: func() *vsphere.Platform {
p := validPlatform()
p.FailureDomains[0].Topology.Datacenter = "non-existent-datacenter"
p.FailureDomains[0].Topology.Datastore = "/non-existent-datacenter/datastore/test-datastore"
p.FailureDomains[0].Topology.ComputeCluster = "/non-existent-datacenter/host/test-cluster"
p.FailureDomains[0].Topology.ResourcePool = "/non-existent-datacenter/host/test-cluster/Resources/test-resourcepool"
p.FailureDomains[0].Topology.Folder = "/non-existent-datacenter/vm/test-folder"
return p
}(),
expectedError: `^test-path\.failureDomains\.topology\.datacenter: Invalid value: "non-existent-datacenter": datacenter must be defined in vCenter test-vcenter datacenters list$`,
},
{
name: "Multi-zone platform failure domain topology cluster relative path",
platform: func() *vsphere.Platform {