Merge pull request #8101 from mkowalski/OPNET-476

OPNET-476: GA Load balancer feature for vSphere and Baremetal

Author: openshift-merge-bot[bot]

pkg/types/baremetal/validation/platform.go

@@ -457,13 +457,6 @@ func ValidatePlatform(p *baremetal.Platform, agentBasedInstallation bool, n *typ
 		allErrs = append(allErrs, validateHostsName(p.Hosts, fldPath.Child("Hosts"))...)
 	}
 
-	// Platform fields only allowed in TechPreviewNoUpgrade
-	if c.FeatureSet != configv1.TechPreviewNoUpgrade {
-		if c.BareMetal.LoadBalancer != nil {
-			allErrs = append(allErrs, field.Forbidden(fldPath.Child("loadBalancer"), "load balancer is not supported in this feature set"))
-		}
-	}
-
 	if c.BareMetal.LoadBalancer != nil {
 		if !validateLoadBalancer(c.BareMetal.LoadBalancer.Type) {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("loadBalancer", "type"), c.BareMetal.LoadBalancer.Type, "invalid load balancer type"))

pkg/types/baremetal/validation/platform_test.go

@@ -181,13 +181,6 @@ func TestValidatePlatform(t *testing.T) {
 				ControlPlane(machinePool().Replicas(1)).build(),
 			expected: "baremetal.hosts\\[0\\].Name: Required value: missing Name",
 		},
-		{
-			name: "forbidden_feature_loadbalancer",
-			config: installConfig().
-				BareMetalPlatform(
-					platform().LoadBalancerType("OpenShiftManagedDefault")).build(),
-			expected: "baremetal.loadBalancer: Forbidden: load balancer is not supported in this feature set",
-		},
 		{
 			name: "allowed_feature_loadbalancer_openshift_managed_default",
 			config: installConfig().

pkg/types/vsphere/validation/platform.go

@@ -73,13 +73,6 @@ func ValidatePlatform(p *vsphere.Platform, agentBasedInstallation bool, fldPath
 		}
 	}
 
-	// Platform fields only allowed in TechPreviewNoUpgrade
-	if c.FeatureSet != configv1.TechPreviewNoUpgrade {
-		if c.VSphere.LoadBalancer != nil {
-			allErrs = append(allErrs, field.Forbidden(fldPath.Child("loadBalancer"), "load balancer is not supported in this feature set"))
-		}
-	}
-
 	if c.VSphere.LoadBalancer != nil {
 		if !validateLoadBalancer(c.VSphere.LoadBalancer.Type) {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("loadBalancer", "type"), c.VSphere.LoadBalancer.Type, "invalid load balancer type"))

pkg/types/vsphere/validation/platform_test.go

@@ -360,22 +360,6 @@ func TestValidatePlatform(t *testing.T) {
 			}(),
 			expectedError: `^test-path\.failureDomains\.zone: Required value: must specify zone tag value`,
 		},
-		{
-			name:     "forbidden load balancer field",
-			platform: validPlatform(),
-			config: &types.InstallConfig{
-				Platform: types.Platform{
-					VSphere: func() *vsphere.Platform {
-						p := validPlatform()
-						p.LoadBalancer = &configv1.VSpherePlatformLoadBalancer{
-							Type: configv1.LoadBalancerTypeOpenShiftManagedDefault,
-						}
-						return p
-					}(),
-				},
-			},
-			expectedError: `^test-path\.loadBalancer: Forbidden: load balancer is not supported in this feature set`,
-		},
 		{
 			name:     "allowed load balancer field with OpenShift managed default",
 			platform: validPlatform(),