Merge pull request #7127 from shiftstack/osp_lb

OSASINFRA-3153: move `loadBalancer` API to GA for OpenStack
openshift · May 31, 2023 · d010f53 · d010f53
2 parents 8e37a97 + 0321c41
commit d010f53
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 123 deletions.
diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml
@@ -3616,7 +3616,7 @@ spec:
                     type: string
                   loadBalancer:
                     description: LoadBalancer defines how the load balancer used by
-                      the cluster is configured. LoadBalancer is available in TechPreview.
+                      the cluster is configured.
                     properties:
                       type:
                         default: OpenShiftManagedDefault

diff --git a/pkg/types/openstack/platform.go b/pkg/types/openstack/platform.go
@@ -120,7 +120,6 @@ type Platform struct {
 	MachinesSubnet string `json:"machinesSubnet,omitempty"`
 
 	// LoadBalancer defines how the load balancer used by the cluster is configured.
-	// LoadBalancer is available in TechPreview.
 	// +optional
 	LoadBalancer *configv1.OpenStackPlatformLoadBalancer `json:"loadBalancer,omitempty"`
 }
diff --git a/pkg/types/openstack/validation/techpreview.go b/pkg/types/openstack/validation/techpreview.go
@@ -14,10 +14,6 @@ func FilledInTechPreviewFields(installConfig *types.InstallConfig) (fields []*fi
 		return nil
 	}
 
-	if installConfig.OpenStack.LoadBalancer != nil {
-		fields = append(fields, field.NewPath("platform", "openstack", "loadBalancer"))
-	}
-
 	if installConfig.ControlPlane != nil && installConfig.ControlPlane.Platform.OpenStack != nil && len(installConfig.ControlPlane.Platform.OpenStack.FailureDomains) > 0 {
 		fields = append(fields, field.NewPath("controlPlane", "platform", "openstack", "failureDomains"))
 	}

diff --git a/pkg/types/openstack/validation/techpreview_test.go b/pkg/types/openstack/validation/techpreview_test.go
diff --git a/pkg/types/validation/installconfig_test.go b/pkg/types/validation/installconfig_test.go
@@ -2028,20 +2028,6 @@ func TestValidateInstallConfig(t *testing.T) {
 			}(),
 			expectedError: "platform.openstack.apiVIPs: Invalid value: \"foobar\": \"foobar\" is not a valid IP",
 		},
-		{
-			name: "should reject load balancer on OpenStack if not TechPreviewNoUpgrade",
-			installConfig: func() *types.InstallConfig {
-				c := validInstallConfig()
-				c.Platform = types.Platform{
-					OpenStack: validOpenStackPlatform(),
-				}
-				c.Platform.OpenStack.LoadBalancer = &configv1.OpenStackPlatformLoadBalancer{
-					Type: configv1.LoadBalancerTypeOpenShiftManagedDefault,
-				}
-				return c
-			}(),
-			expectedError: `platform.openstack.loadBalancer: Forbidden: the TechPreviewNoUpgrade feature set must be enabled to use this field`,
-		},
 		{
 			name: "should not validate vips on VSphere if not set (vips are not required on VSphere)",
 			installConfig: func() *types.InstallConfig {

diff --git a/scripts/openstack/manifest-tests/lb-default-techpreview/install-config.yaml b/scripts/openstack/manifest-tests/lb-default-techpreview/install-config.yaml
diff --git a/scripts/openstack/manifest-tests/lb-default-techpreview/test_cluster-infra.py b/scripts/openstack/manifest-tests/lb-default-techpreview/test_cluster-infra.py
diff --git a/scripts/openstack/manifest-tests/lb-managed/install-config.yaml b/scripts/openstack/manifest-tests/lb-managed/install-config.yaml
@@ -30,5 +30,4 @@ platform:
     cloud: ${OS_CLOUD}
     loadBalancer:
       type: OpenShiftManagedDefault
-featureSet: TechPreviewNoUpgrade
 pullSecret: ${PULL_SECRET}
diff --git a/scripts/openstack/manifest-tests/lb-unmanaged/install-config.yaml b/scripts/openstack/manifest-tests/lb-unmanaged/install-config.yaml
@@ -30,5 +30,4 @@ platform:
     cloud: ${OS_CLOUD}
     loadBalancer:
       type: UserManaged
-featureSet: TechPreviewNoUpgrade
 pullSecret: ${PULL_SECRET}