Skip to content

Commit 0321c41

Browse files
committed
OSASINFRA-3153: move loadBalancer API to GA for OpenStack
This API has not moved and there is no plan to make any change that would be backward incompatible in the future. The feature was well tested (and automated) by our QE on this platform, as well documented on OCP 4.13. We think this API is ready to be GA'ed.
1 parent 85138dd commit 0321c41

File tree

9 files changed

+1
-123
lines changed

9 files changed

+1
-123
lines changed

data/data/install.openshift.io_installconfigs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3610,7 +3610,7 @@ spec:
36103610
type: string
36113611
loadBalancer:
36123612
description: LoadBalancer defines how the load balancer used by
3613-
the cluster is configured. LoadBalancer is available in TechPreview.
3613+
the cluster is configured.
36143614
properties:
36153615
type:
36163616
default: OpenShiftManagedDefault

pkg/types/openstack/platform.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ type Platform struct {
120120
MachinesSubnet string `json:"machinesSubnet,omitempty"`
121121

122122
// LoadBalancer defines how the load balancer used by the cluster is configured.
123-
// LoadBalancer is available in TechPreview.
124123
// +optional
125124
LoadBalancer *configv1.OpenStackPlatformLoadBalancer `json:"loadBalancer,omitempty"`
126125
}

pkg/types/openstack/validation/techpreview.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ func FilledInTechPreviewFields(installConfig *types.InstallConfig) (fields []*fi
1414
return nil
1515
}
1616

17-
if installConfig.OpenStack.LoadBalancer != nil {
18-
fields = append(fields, field.NewPath("platform", "openstack", "loadBalancer"))
19-
}
20-
2117
if installConfig.ControlPlane != nil && installConfig.ControlPlane.Platform.OpenStack != nil && len(installConfig.ControlPlane.Platform.OpenStack.FailureDomains) > 0 {
2218
fields = append(fields, field.NewPath("controlPlane", "platform", "openstack", "failureDomains"))
2319
}

pkg/types/openstack/validation/techpreview_test.go

Lines changed: 0 additions & 39 deletions
This file was deleted.

pkg/types/validation/installconfig_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2028,20 +2028,6 @@ func TestValidateInstallConfig(t *testing.T) {
20282028
}(),
20292029
expectedError: "platform.openstack.apiVIPs: Invalid value: \"foobar\": \"foobar\" is not a valid IP",
20302030
},
2031-
{
2032-
name: "should reject load balancer on OpenStack if not TechPreviewNoUpgrade",
2033-
installConfig: func() *types.InstallConfig {
2034-
c := validInstallConfig()
2035-
c.Platform = types.Platform{
2036-
OpenStack: validOpenStackPlatform(),
2037-
}
2038-
c.Platform.OpenStack.LoadBalancer = &configv1.OpenStackPlatformLoadBalancer{
2039-
Type: configv1.LoadBalancerTypeOpenShiftManagedDefault,
2040-
}
2041-
return c
2042-
}(),
2043-
expectedError: `platform.openstack.loadBalancer: Forbidden: the TechPreviewNoUpgrade feature set must be enabled to use this field`,
2044-
},
20452031
{
20462032
name: "should not validate vips on VSphere if not set (vips are not required on VSphere)",
20472033
installConfig: func() *types.InstallConfig {

scripts/openstack/manifest-tests/lb-default-techpreview/install-config.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

scripts/openstack/manifest-tests/lb-default-techpreview/test_cluster-infra.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

scripts/openstack/manifest-tests/lb-managed/install-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ platform:
3030
cloud: ${OS_CLOUD}
3131
loadBalancer:
3232
type: OpenShiftManagedDefault
33-
featureSet: TechPreviewNoUpgrade
3433
pullSecret: ${PULL_SECRET}

scripts/openstack/manifest-tests/lb-unmanaged/install-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ platform:
3030
cloud: ${OS_CLOUD}
3131
loadBalancer:
3232
type: UserManaged
33-
featureSet: TechPreviewNoUpgrade
3433
pullSecret: ${PULL_SECRET}

0 commit comments

Comments
 (0)