Merge pull request #9914 from jcpowermac/vsphere7-eol

SPLAT-2430: Update vSphere version validations for 7 EOL and VCF 9

Author: openshift-merge-bot[bot]

go.mod

@@ -115,7 +115,7 @@ require (
 	github.com/thoas/go-funk v0.9.3
 	github.com/ulikunitz/xz v0.5.12
 	github.com/vincent-petithory/dataurl v1.0.0
-	github.com/vmware/govmomi v0.47.1
+	github.com/vmware/govmomi v0.49.0
 	go.uber.org/mock v0.5.0
 	golang.org/x/crypto v0.38.0
 	golang.org/x/oauth2 v0.28.0

go.sum

@@ -950,8 +950,8 @@ github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/vmware/govmomi v0.47.1 h1:6a2iNaqSS2/AFfvI8UMe0l787/TBKkK0KK9jCqCyYCE=
-github.com/vmware/govmomi v0.47.1/go.mod h1:bYwUHpGpisE4AOlDl5eph90T+cjJMIcKx/kaa5v5rQM=
+github.com/vmware/govmomi v0.49.0 h1:M80ExmFq3kOfeMvMJcHnXgA/4w5hUAFfYfc+Qm3lmPg=
+github.com/vmware/govmomi v0.49.0/go.mod h1:+oZ0tYJw/pXKoeWHLR9Egq5KENVr2hLePRzisFhEWpA=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=

pkg/asset/installconfig/vsphere/mock/vsphere_sim.go

@@ -22,27 +22,47 @@ import (
 	_ "github.com/vmware/govmomi/vapi/simulator"
 )
 
-const (
-	esxi7U2BuildNumber    int    = 17630552
-	esxi7U2Version        string = "7.0.2"
-	vcenter7U2BuildNumber int    = 17694817
-	vcenter7U2Version     string = "7.0.2"
-)
+// VSphereSimulator contains the vSphere versioning that will be used in the simulator.
+type VSphereSimulator struct {
+	VCenterVersion string
+	VCenterBuild   int
+	EsxiVersion    string
+	EsxiBuild      int
+}
+
+// NewSimulator creates a new VSphereSimulator, if versions are empty or 0 default values are used.
+func NewSimulator(vcenterVersion, esxiVersion string, vcenterBuild, esxiBuild int) *VSphereSimulator {
+	vss := &VSphereSimulator{
+		VCenterVersion: vcenterVersion,
+		VCenterBuild:   vcenterBuild,
+		EsxiVersion:    esxiVersion,
+		EsxiBuild:      esxiBuild,
+	}
+
+	if vss.VCenterVersion == "" || vss.EsxiVersion == "" {
+		return &VSphereSimulator{
+			VCenterVersion: "8.0.0",
+			VCenterBuild:   20519528,
+			EsxiVersion:    "8.0.0",
+			EsxiBuild:      20513097,
+		}
+	}
+	return vss
+}
 
 // StartSimulator starts an instance of the simulator which listens on 127.0.0.1.
 // Call GetClient to retrieve a vim25.client which will connect to and trust this
 // simulator
-func StartSimulator(setVersionToSupported bool) (*simulator.Server, error) {
+func (vss *VSphereSimulator) StartSimulator() (*simulator.Server, error) {
 	model := simulator.VPX()
 
 	// Change the simulated vCenter and ESXi hosts
 	// to the version and build we support.
-	if setVersionToSupported {
-		esx.HostSystem.Config.Product.Build = strconv.Itoa(esxi7U2BuildNumber)
-		esx.HostSystem.Config.Product.Version = esxi7U2Version
-		model.ServiceContent.About.Build = strconv.Itoa(vcenter7U2BuildNumber)
-		model.ServiceContent.About.Version = vcenter7U2Version
-	}
+
+	esx.HostSystem.Config.Product.Build = strconv.Itoa(vss.EsxiBuild)
+	esx.HostSystem.Config.Product.Version = vss.EsxiVersion
+	model.ServiceContent.About.Build = strconv.Itoa(vss.VCenterBuild)
+	model.ServiceContent.About.Version = vss.VCenterVersion
 
 	model.ClusterHost = 6
 	model.Folder = 1

pkg/asset/installconfig/vsphere/permission_test.go

@@ -151,7 +151,8 @@ func validIPIMultiZoneInstallConfig() *types.InstallConfig {
 
 func TestPermissionValidate(t *testing.T) {
 	ctx := context.TODO()
-	server, err := mock.StartSimulator(true)
+	vs := mock.NewSimulator("", "", 0, 0)
+	server, err := vs.StartSimulator()
 	if err != nil {
 		t.Error(err)
 		return

pkg/asset/installconfig/vsphere/validation.go

@@ -38,12 +38,6 @@ type TagManager interface {
 	GetAttachedTagsOnObjects(ctx context.Context, objectID []mo.Reference) ([]vapitags.AttachedTags, error)
 }
 
-const (
-	esxi7U2BuildNumber    int    = 17630552
-	vcenter7U2BuildNumber int    = 17694817
-	vcenter7U2Version     string = "7.0.2"
-)
-
 var localLogger = logrus.New()
 
 type validationContext struct {
@@ -233,18 +227,49 @@ func validateHostGroups(validationCtx *validationContext, cluster, hostGroup str
 	return append(allErrs, field.NotFound(fldPath, hostGroup))
 }
 
+const (
+	eolVSphereVersion int = 7
+
+	// csi driver requirement.
+	minimumVCenterBuild    int = 17694817
+	minimumEsxiBuildNumber int = 17630552
+
+	supportedVSphereVersion int = 8
+
+	// GA build of vCenter 8, there are no constraints with csi.
+	supportedVCenterBuild    int = 20519528
+	supportedEsxiBuildNumber int = 20513097
+)
+
+func getVSphereConstraints() (version.Constraints, version.Constraints, error) {
+	eolConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d, < %d", eolVSphereVersion, supportedVSphereVersion))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// We support vSphere 8 only, so >= 8 (covers semver minor and patch)
+	supportedConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d, < %d", supportedVSphereVersion, supportedVSphereVersion+1))
+	if err != nil {
+		return nil, nil, err
+	}
+	return eolConstraints, supportedConstraints, nil
+}
+
 func validateVCenterVersion(validationCtx *validationContext, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	constraints, err := version.NewConstraint(fmt.Sprintf("< %s", vcenter7U2Version))
+	eolConstraints, supportedConstraints, err := getVSphereConstraints()
 	if err != nil {
 		allErrs = append(allErrs, field.InternalError(fldPath, err))
 	}
 
+	// Current vCenter version
 	vCenterVersion, err := version.NewVersion(validationCtx.Client.ServiceContent.About.Version)
 	if err != nil {
 		allErrs = append(allErrs, field.InternalError(fldPath, err))
 	}
+
+	// Current vCenter Build number
 	build, err := strconv.Atoi(validationCtx.Client.ServiceContent.About.Build)
 	if err != nil {
 		allErrs = append(allErrs, field.InternalError(fldPath, err))
@@ -253,9 +278,25 @@ func validateVCenterVersion(validationCtx *validationContext, fldPath *field.Pat
 	detail := fmt.Sprintf("The vSphere storage driver requires a minimum of vSphere 7 Update 2. Current vCenter version: %s, build: %s",
 		validationCtx.Client.ServiceContent.About.Version, validationCtx.Client.ServiceContent.About.Build)
 
-	if constraints.Check(vCenterVersion) {
-		allErrs = append(allErrs, field.Required(fldPath, detail))
-	} else if build < vcenter7U2BuildNumber {
+	switch {
+	case eolConstraints.Check(vCenterVersion):
+		// While vSphere 7 is EOL we can't block installs because a customer could
+		// have an extended support and a support exception
+		logrus.Warnf("VMware vSphere 7 is end of service as of 10/2/2025. Current vCenter version: %s, build: %d", vCenterVersion.String(), build)
+
+		// Still running vSphere 7 but wrong build to use CSI driver
+		if build < minimumVCenterBuild {
+			allErrs = append(allErrs, field.Required(fldPath, detail))
+		}
+	case supportedConstraints.Check(vCenterVersion):
+		// This is currently set to the GA build number, all of vSphere 8 is supported
+		if build < supportedVCenterBuild {
+			allErrs = append(allErrs, field.Required(fldPath, detail))
+		}
+		// This covers prior to 7 and VCF 9 which is currently not tested
+	default:
+		detail = fmt.Sprintf("Unsupported or untested version of vSphere. Current vCenter version: %s, build: %s",
+			validationCtx.Client.ServiceContent.About.Version, validationCtx.Client.ServiceContent.About.Build)
 		allErrs = append(allErrs, field.Required(fldPath, detail))
 	}
 
@@ -269,6 +310,11 @@ func validateESXiVersion(validationCtx *validationContext, clusterPath string, v
 	ctx, cancel := context.WithTimeout(context.TODO(), 60*time.Second)
 	defer cancel()
 
+	eolConstraints, supportedConstraints, err := getVSphereConstraints()
+	if err != nil {
+		allErrs = append(allErrs, field.InternalError(vSphereFldPath, err))
+	}
+
 	clusters, err := finder.ClusterComputeResourceList(ctx, clusterPath)
 
 	if err != nil {
@@ -289,11 +335,6 @@ func validateESXiVersion(validationCtx *validationContext, clusterPath string, v
 		}
 	}
 
-	v7, err := version.NewVersion("7.0")
-	if err != nil {
-		return append(allErrs, field.InternalError(vSphereFldPath, err))
-	}
-
 	hosts, err := clusters[0].Hosts(context.TODO())
 	if err != nil {
 		err = errors.Wrapf(err, "unable to find hosts from cluster on path: %s", clusterPath)
@@ -324,16 +365,32 @@ func validateESXiVersion(validationCtx *validationContext, clusterPath string, v
 		detail := fmt.Sprintf("The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: %s is version: %s and build: %s",
 			h.Name(), mh.Config.Product.Version, mh.Config.Product.Build)
 
-		if esxiHostVersion.LessThan(v7) {
-			allErrs = append(allErrs, field.Required(computeClusterFldPath, detail))
-		} else {
-			build, err := strconv.Atoi(mh.Config.Product.Build)
-			if err != nil {
-				return append(allErrs, field.InternalError(vSphereFldPath, err))
+		build, err := strconv.Atoi(mh.Config.Product.Build)
+		if err != nil {
+			return append(allErrs, field.InternalError(vSphereFldPath, err))
+		}
+
+		switch {
+		case eolConstraints.Check(esxiHostVersion):
+			// While vSphere 7 is EOL we can't block installs because a customer could
+			// have an extended support and a support exception
+			logrus.Warnf("VMware vSphere 7 is end of service as of 10/2/2025. The ESXi host: %s is version: %s and build: %s",
+				h.Name(), mh.Config.Product.Version, mh.Config.Product.Build)
+
+			// Still running vSphere 7 but wrong build to use CSI driver
+			if build < minimumEsxiBuildNumber {
+				allErrs = append(allErrs, field.Required(vSphereFldPath, detail))
 			}
-			if build < esxi7U2BuildNumber {
-				allErrs = append(allErrs, field.Required(computeClusterFldPath, detail))
+		case supportedConstraints.Check(esxiHostVersion):
+			// This is currently set to the GA build number, all of vSphere 8 is supported
+			if build < supportedEsxiBuildNumber {
+				allErrs = append(allErrs, field.Required(vSphereFldPath, detail))
 			}
+			// This covers prior to 7 and VCF 9 which is currently not tested
+		default:
+			detail = fmt.Sprintf("Unsupported or untested version of vSphere.  The ESXi host: %s is version: %s and build: %s",
+				h.Name(), mh.Config.Product.Version, mh.Config.Product.Build)
+			allErrs = append(allErrs, field.Required(vSphereFldPath, detail))
 		}
 	}
 	return allErrs