Merge pull request openshift#7908 from openshift-splat-team/SPLAT-1390

SPLAT-1390: remove feature gate for vSphere control plane machinesets

Author: openshift-merge-bot[bot]

pkg/asset/machines/master.go

@@ -461,10 +461,6 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 		ipClaims = data.IPClaims
 		ipAddrs = data.IPAddresses
 
-		if ic.FeatureSet != configv1.TechPreviewNoUpgrade {
-			controlPlaneMachineSet = nil
-		}
-
 		vsphere.ConfigMasters(machines, clusterID.InfraID)
 	case powervstypes.Name:
 		mpool := defaultPowerVSMachinePoolPlatform(ic)

pkg/asset/machines/vsphere/machines.go

@@ -316,11 +316,11 @@ func provider(clusterID string, vcenter *vsphere.VCenter, failureDomain vsphere.
 	networkDeviceSpec := make([]machineapi.NetworkDeviceSpec, len(failureDomain.Topology.Networks))
 
 	// If failureDomain.Topology.Folder is empty this will be used
-	folder := fmt.Sprintf("/%s/vm/%s", failureDomain.Topology.Datacenter, clusterID)
+	folder := path.Clean(fmt.Sprintf("/%s/vm/%s", failureDomain.Topology.Datacenter, clusterID))
 
 	// If failureDomain.Topology.ResourcePool is empty this will be used
 	// computeCluster is required to be a path
-	resourcePool := fmt.Sprintf("%s/Resources", failureDomain.Topology.ComputeCluster)
+	resourcePool := path.Clean(fmt.Sprintf("%s/Resources", failureDomain.Topology.ComputeCluster))
 
 	if failureDomain.Topology.Folder != "" {
 		folder = failureDomain.Topology.Folder

pkg/types/vsphere/validation/platform.go

@@ -3,6 +3,7 @@ package validation
 import (
 	"fmt"
 	"net"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -171,6 +172,7 @@ func validateFailureDomains(p *vsphere.Platform, fldPath *field.Path, isLegacyUp
 			if !strings.Contains(failureDomain.Topology.Datastore, failureDomain.Topology.Datacenter) {
 				return append(allErrs, field.Invalid(topologyFld.Child("datastore"), failureDomain.Topology.Datastore, "the datastore defined does not exist in the correct datacenter"))
 			}
+			p.FailureDomains[index].Topology.Datastore = filepath.Clean(p.FailureDomains[index].Topology.Datastore)
 		}
 
 		if len(failureDomain.Topology.TagIDs) > 10 {
@@ -222,6 +224,7 @@ func validateFailureDomains(p *vsphere.Platform, fldPath *field.Path, isLegacyUp
 			if len(failureDomain.Topology.Datacenter) != 0 && datacenterName != failureDomain.Topology.Datacenter {
 				return append(allErrs, field.Invalid(topologyFld.Child("computeCluster"), computeCluster, fmt.Sprintf("compute cluster must be in datacenter %s", failureDomain.Topology.Datacenter)))
 			}
+			p.FailureDomains[index].Topology.ComputeCluster = filepath.Clean(p.FailureDomains[index].Topology.ComputeCluster)
 		}
 
 		if len(failureDomain.Topology.ResourcePool) != 0 {
@@ -239,6 +242,12 @@ func validateFailureDomains(p *vsphere.Platform, fldPath *field.Path, isLegacyUp
 			if len(failureDomain.Topology.ComputeCluster) != 0 && !strings.Contains(failureDomain.Topology.ComputeCluster, clusterName) {
 				return append(allErrs, field.Invalid(topologyFld.Child("resourcePool"), resourcePool, fmt.Sprintf("resource pool must be in compute cluster %s", failureDomain.Topology.ComputeCluster)))
 			}
+
+			p.FailureDomains[index].Topology.ResourcePool = filepath.Clean(p.FailureDomains[index].Topology.ResourcePool)
+		}
+
+		if len(failureDomain.Topology.Template) > 0 {
+			p.FailureDomains[index].Topology.Template = filepath.Clean(p.FailureDomains[index].Topology.Template)
 		}
 	}