Skip to content

Commit 0d91813

Browse files
committed
OSASINFRA-3237: move controlPlanePort API to GA
This API has not moved and there is no plan to make any changes that would be backward incompatible in the future.
1 parent 2596e5d commit 0d91813

File tree

6 files changed

+2
-79
lines changed

6 files changed

+2
-79
lines changed

data/data/install.openshift.io_installconfigs.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3703,8 +3703,7 @@ spec:
37033703
for dualstack clusters. Providing this configuration will prevent
37043704
OpenShift from managing or updating this network and its subnets.
37053705
The network and its subnets will be used during creation of
3706-
all nodes. This is a TechPreview feature and requires setting
3707-
featureSet to TechPreviewNoUpgrade.
3706+
all nodes.
37083707
properties:
37093708
fixedIPs:
37103709
description: Specify subnets of the network where control

docs/user/openstack/deploy_dual_stack_cluster.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Now that the Networking resources are pre-created you can deploy OpenShift. Here
4949
```yaml
5050
apiVersion: v1
5151
baseDomain: mydomain.test
52-
featureSet: TechPreviewNoUpgrade
5352
compute:
5453
- name: worker
5554
platform:
@@ -92,4 +91,4 @@ platform:
9291
```
9392
There are important things to note:
9493

95-
The subnets under `platform.openstack.controlPlanePort.fixedIPs` can contain both id or name. The same applies to the network `platform.openstack.controlPlanePort.network`. Dual-stack clusters are only supported with `featureSet: TechPreviewNoUpgrade`
94+
The subnets under `platform.openstack.controlPlanePort.fixedIPs` can contain both id or name. The same applies to the network `platform.openstack.controlPlanePort.network`.

pkg/types/openstack/platform.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ type Platform struct {
123123
// ControlPlanePort contains details of the network attached to the control plane port, with the network either containing one openstack
124124
// subnet for IPv4 or two openstack subnets for dualstack clusters. Providing this configuration will prevent OpenShift from managing
125125
// or updating this network and its subnets. The network and its subnets will be used during creation of all nodes.
126-
// This is a TechPreview feature and requires setting featureSet to TechPreviewNoUpgrade.
127126
// +optional
128127
ControlPlanePort *PortTarget `json:"controlPlanePort,omitempty"`
129128

pkg/types/openstack/validation/techpreview.go

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

pkg/types/openstack/validation/techpreview_test.go

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

pkg/types/validation/installconfig.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,17 +1105,6 @@ func validateCustomFeatureGates(c *types.InstallConfig) field.ErrorList {
11051105
func validateGatedFeatures(c *types.InstallConfig) field.ErrorList {
11061106
allErrs := field.ErrorList{}
11071107

1108-
// legacy feature gating
1109-
if c.FeatureSet != configv1.TechPreviewNoUpgrade {
1110-
errMsg := "the TechPreviewNoUpgrade feature set must be enabled to use this field"
1111-
1112-
if c.OpenStack != nil {
1113-
for _, f := range openstackvalidation.FilledInTechPreviewFields(c) {
1114-
allErrs = append(allErrs, field.Forbidden(f, errMsg))
1115-
}
1116-
}
1117-
}
1118-
11191108
gatedFeatures := []featuregates.GatedInstallConfigFeature{}
11201109
switch {
11211110
case c.GCP != nil:

0 commit comments

Comments
 (0)