Merge pull request #9963 from jcpowermac/vsphere-7-warn-only

SPLAT-2511: vSphere - do not block on vSphere >7.0.2, allow 9

Author: openshift-merge-bot[bot]

pkg/asset/installconfig/vsphere/permission_test.go

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

pkg/asset/installconfig/vsphere/validation.go

@@ -227,6 +227,15 @@ func validateHostGroups(validationCtx *validationContext, cluster, hostGroup str
 	return append(allErrs, field.NotFound(fldPath, hostGroup))
 }
 
+/* Support Scenario Notes
+ * <7 not supported - validation fail
+ * <7.0.2 not supported because of CSI drivers - validation fail
+ * >= 7.0.2 <8 - eol warning only - validation pass
+ * >=8 - validation pass
+ * https://knowledge.broadcom.com/external/article/326316/build-numbers-and-versions-of-vmware-vce.html
+ * https://knowledge.broadcom.com/external/article/314608/correlating-vmware-cloud-foundation-vers.html
+ */
+
 const (
 	eolVSphereVersion int = 7
 
@@ -239,31 +248,31 @@ const (
 	// GA build of vCenter 8, there are no constraints with csi.
 	supportedVCenterBuild    int = 20519528
 	supportedEsxiBuildNumber int = 20513097
+
+	vSphereCsiMinimumVersion string = "7.0.2"
 )
 
-func getVSphereConstraints() (version.Constraints, version.Constraints, error) {
-	eolConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d, < %d", eolVSphereVersion, supportedVSphereVersion))
+func validateVCenterVersion(validationCtx *validationContext, fldPath *field.Path) field.ErrorList {
+	allErrs := field.ErrorList{}
+
+	// constraints
+	// CSI version constraint
+	csiConstraint, err := version.NewConstraint(fmt.Sprintf(">= %d, < %s", eolVSphereVersion, vSphereCsiMinimumVersion))
 	if err != nil {
-		return nil, nil, err
+		allErrs = append(allErrs, field.InternalError(fldPath, err))
 	}
 
-	// We support vSphere 8 only, so >= 8 (covers semver minor and patch)
-	supportedConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d, < %d", supportedVSphereVersion, supportedVSphereVersion+1))
+	eolConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d, < %d", eolVSphereVersion, supportedVSphereVersion))
 	if err != nil {
-		return nil, nil, err
+		allErrs = append(allErrs, field.InternalError(fldPath, err))
 	}
-	return eolConstraints, supportedConstraints, nil
-}
 
-func validateVCenterVersion(validationCtx *validationContext, fldPath *field.Path) field.ErrorList {
-	allErrs := field.ErrorList{}
-
-	eolConstraints, supportedConstraints, err := getVSphereConstraints()
+	// We support vSphere 8 and VVF/VCF 9
+	supportedConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d", supportedVSphereVersion))
 	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))
@@ -279,7 +288,13 @@ func validateVCenterVersion(validationCtx *validationContext, fldPath *field.Pat
 		validationCtx.Client.ServiceContent.About.Version, validationCtx.Client.ServiceContent.About.Build)
 
 	switch {
+	// case: vCenter < 7.0.2
+	case csiConstraint.Check(vCenterVersion):
+		// case: < 7.0.2
+		logrus.Warnf("VMware vSphere 7 is end of service as of 10/2/2025. Current vCenter version: %s, build: %d", vCenterVersion.String(), build)
+		allErrs = append(allErrs, field.Required(fldPath, detail))
 	case eolConstraints.Check(vCenterVersion):
+		// case: >= 7.0.0 < 8.0.0
 		// 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)
@@ -289,13 +304,14 @@ func validateVCenterVersion(validationCtx *validationContext, fldPath *field.Pat
 			allErrs = append(allErrs, field.Required(fldPath, detail))
 		}
 	case supportedConstraints.Check(vCenterVersion):
+		// case: >= 8.0.0
 		// 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",
+		// case: < 7.0.0
+		detail = fmt.Sprintf("Unsupported 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))
 	}
@@ -310,7 +326,18 @@ func validateESXiVersion(validationCtx *validationContext, clusterPath string, v
 	ctx, cancel := context.WithTimeout(context.TODO(), 60*time.Second)
 	defer cancel()
 
-	eolConstraints, supportedConstraints, err := getVSphereConstraints()
+	csiConstraint, err := version.NewConstraint(fmt.Sprintf(">= %d, < %s", eolVSphereVersion, vSphereCsiMinimumVersion))
+	if err != nil {
+		allErrs = append(allErrs, field.InternalError(vSphereFldPath, err))
+	}
+
+	eolConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d, < %d", eolVSphereVersion, supportedVSphereVersion))
+	if err != nil {
+		allErrs = append(allErrs, field.InternalError(vSphereFldPath, err))
+	}
+
+	// We support vSphere 8 and VVF/VCF 9
+	supportedConstraints, err := version.NewConstraint(fmt.Sprintf(">= %d", supportedVSphereVersion))
 	if err != nil {
 		allErrs = append(allErrs, field.InternalError(vSphereFldPath, err))
 	}
@@ -371,24 +398,28 @@ func validateESXiVersion(validationCtx *validationContext, clusterPath string, v
 		}
 
 		switch {
+		// case: vCenter < 7.0.2
+		case csiConstraint.Check(esxiHostVersion):
+			// case: < 7.0.2
+			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)
+			allErrs = append(allErrs, field.Required(vSphereFldPath, detail))
 		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))
 			}
 		case supportedConstraints.Check(esxiHostVersion):
+			// case: >= 8.0.0
 			// 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",
+			// case: < 7.0.0
+			detail = fmt.Sprintf("Unsupported 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))
 		}

pkg/asset/installconfig/vsphere/validation_test.go

@@ -224,7 +224,7 @@ func simulatorHelper(t *testing.T, vs *mock.VSphereSimulator) (*validationContex
 	t.Helper()
 
 	if vs == nil {
-		vs = mock.NewSimulator("", "", 0, 0)
+		vs = mock.NewSimulator("8.0.2", "8.0.2", 24321653, 23825572)
 	}
 	server, err := vs.StartSimulator()
 	if err != nil {
@@ -541,7 +541,7 @@ func Test_validateVCenterVersion(t *testing.T) {
 			expectErr: ``,
 		},
 		{
-			name: "vcf 9 is not supported",
+			name: "vcf 9 is supported",
 			VSphereSimulator: &mock.VSphereSimulator{
 				VCenterVersion: "9.0.0",
 				VCenterBuild:   24755230,
@@ -551,7 +551,7 @@ func Test_validateVCenterVersion(t *testing.T) {
 				EsxiBuild:   24859861,
 			},
 			fldPath:   field.NewPath("platform").Child("vsphere").Child("vcenters"),
-			expectErr: `platform.vsphere.vcenters: Required value: Unsupported or untested version of vSphere. Current vCenter version: 9.0.0, build: 24755230`,
+			expectErr: ``,
 		},
 		{
 			name: "vsphere 7 eol but csi support",
@@ -566,6 +566,19 @@ func Test_validateVCenterVersion(t *testing.T) {
 			fldPath:   field.NewPath("platform").Child("vsphere").Child("vcenters"),
 			expectErr: ``,
 		},
+		{
+			name: "vsphere 7 eol but no csi support",
+			VSphereSimulator: &mock.VSphereSimulator{
+				VCenterVersion: "7.0.1",
+				// vCenter Server 7.0 Update 1d
+				VCenterBuild: 17491160,
+				EsxiVersion:  "7.0.1",
+				// ESXi 7.0.2 EP2
+				EsxiBuild: 18538813,
+			},
+			fldPath:   field.NewPath("platform").Child("vsphere").Child("vcenters"),
+			expectErr: `platform.vsphere.vcenters: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. Current vCenter version: 7.0.1, build: 17491160`,
+		},
 		{
 			name: "vsphere 6 eol",
 			VSphereSimulator: &mock.VSphereSimulator{
@@ -577,7 +590,7 @@ func Test_validateVCenterVersion(t *testing.T) {
 				EsxiBuild: 20497097,
 			},
 			fldPath:   field.NewPath("platform").Child("vsphere").Child("vcenters"),
-			expectErr: `platform.vsphere.vcenters: Required value: Unsupported or untested version of vSphere. Current vCenter version: 6.7, build: 24337536`,
+			expectErr: `platform.vsphere.vcenters: Required value: Unsupported version of vSphere. Current vCenter version: 6.7, build: 24337536`,
 		},
 	}
 
@@ -649,6 +662,19 @@ func Test_validateESXiVersion(t *testing.T) {
 			computeClusterPath: platform.FailureDomains[0].Topology.ComputeCluster,
 			expectErr:          ``,
 		},
+		{
+			name: "vsphere 7 eol but no csi support",
+			VSphereSimulator: &mock.VSphereSimulator{
+				VCenterVersion: "7.0.2",
+				// vCenter Server 7.0 Update 2a
+				VCenterBuild: 17920168,
+				EsxiVersion:  "7.0.1",
+				// ESXi 7.0.2 EP2
+				EsxiBuild: 16850804,
+			},
+			computeClusterPath: platform.FailureDomains[0].Topology.ComputeCluster,
+			expectErr:          `[platform.vsphere: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: DC0_C0_H0 is version: 7.0.1 and build: 16850804, platform.vsphere: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: DC0_C0_H1 is version: 7.0.1 and build: 16850804, platform.vsphere: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: DC0_C0_H2 is version: 7.0.1 and build: 16850804, platform.vsphere: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: DC0_C0_H3 is version: 7.0.1 and build: 16850804, platform.vsphere: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: DC0_C0_H4 is version: 7.0.1 and build: 16850804, platform.vsphere: Required value: The vSphere storage driver requires a minimum of vSphere 7 Update 2. The ESXi host: DC0_C0_H5 is version: 7.0.1 and build: 16850804]`,
+		},
 		{
 			name: "computeCluster not found",
 			VSphereSimulator: &mock.VSphereSimulator{

pkg/types/vsphere/conversion/installconfig_test.go

@@ -380,8 +380,7 @@ func validIpiInstallConfig() *types.InstallConfig {
 
 func TestConvertInstallConfig(t *testing.T) {
 	logger, hook := test.NewNullLogger()
-
-	vs := mock.NewSimulator("", "", 0, 0)
+	vs := mock.NewSimulator("8.0.2", "8.0.2", 24321653, 23825572)
 	sim, err := vs.StartSimulator()
 
 	if err != nil {