Skip to content

OCPEDGE-2746: Add MutableTopology feature gated infra spec.controlPlaneTopology #2891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeff-roche wants to merge 5 commits into
base: master
Choose a base branch
from
Open

OCPEDGE-2746: Add MutableTopology feature gated infra spec.controlPlaneTopology #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87d16f2
Add MutableTopology feature gate for spec.controlPlaneTopology
jeff-roche Jun 15, 2026
eaf0036
chore: rebase
jeff-roche Jun 17, 2026
4dee825
fix: switching back to featuregateawareenum
jeff-roche Jun 17, 2026
362360a
fix: switching to kubebuilder enum
jeff-roche Jun 18, 2026
2b843a2
feat: adding CEL validation to the Infrastructure object for MutableT…
jeff-roche Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 79 additions & 79 deletions config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop

Large diffs are not rendered by default.

245 changes: 245 additions & 0 deletions config/v1/tests/infrastructures.config.openshift.io/MutableTopology.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- MutableTopology
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure without controlPlaneTopology in spec
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
- name: Should be able to create Infrastructure with spec controlPlaneTopology set to HighlyAvailable
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
- name: Should be able to create Infrastructure with spec controlPlaneTopology set to SingleReplica
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: SingleReplica
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: SingleReplica
- name: Should not allow creating Infrastructure with spec controlPlaneTopology set to an invalid value
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: InvalidValue
expectedError: 'spec.controlPlaneTopology: Unsupported value: "InvalidValue": supported values: "HighlyAvailable", "SingleReplica"'
- name: Should not allow creating Infrastructure with spec controlPlaneTopology set to External
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: External
expectedError: 'spec.controlPlaneTopology: Unsupported value: "External": supported values: "HighlyAvailable", "SingleReplica"'
- name: Should not allow creating Infrastructure with spec controlPlaneTopology set to DualReplica
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: DualReplica
expectedError: 'spec.controlPlaneTopology: Unsupported value: "DualReplica": supported values: "HighlyAvailable", "SingleReplica"'
- name: Should not allow creating Infrastructure with spec controlPlaneTopology set to HighlyAvailableArbiter
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailableArbiter
expectedError: 'spec.controlPlaneTopology: Unsupported value: "HighlyAvailableArbiter": supported values: "HighlyAvailable", "SingleReplica"'
onUpdate:
- name: Should allow updating spec controlPlaneTopology from SingleReplica to HighlyAvailable when status controlPlaneTopology is SingleReplica
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: SingleReplica
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
- name: Should allow setting spec controlPlaneTopology to HighlyAvailable when it was not previously set and status controlPlaneTopology is SingleReplica
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
- name: Should not allow setting spec controlPlaneTopology to HighlyAvailable when status controlPlaneTopology is HighlyAvailable
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expectedError: "spec.controlPlaneTopology can only be set to HighlyAvailable when status.controlPlaneTopology is SingleReplica"
Comment on lines +123 to +141

@JoelSpeed JoelSpeed Jun 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would expect you to be able to set the spec to match the status, it wouldn't do anything, but you should be able to do it

- name: Should not allow setting spec controlPlaneTopology to SingleReplica when status controlPlaneTopology is SingleReplica
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: SingleReplica
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expectedError: "spec.controlPlaneTopology can only be set to HighlyAvailable when status.controlPlaneTopology is SingleReplica"
- name: Should not allow setting spec controlPlaneTopology to SingleReplica when status controlPlaneTopology is HighlyAvailable
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: SingleReplica
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expectedError: "spec.controlPlaneTopology can only be set to HighlyAvailable when status.controlPlaneTopology is SingleReplica"
- name: Should allow removing spec controlPlaneTopology
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
- name: Should allow keeping spec controlPlaneTopology unchanged
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
status:
controlPlaneTopology: SingleReplica
infrastructureTopology: HighlyAvailable
cpuPartitioning: None
- name: Should not allow updating spec controlPlaneTopology to an invalid value
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: HighlyAvailable
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
controlPlaneTopology: InvalidValue
expectedError: 'spec.controlPlaneTopology: Unsupported value: "InvalidValue": supported values: "HighlyAvailable", "SingleReplica"'
16 changes: 16 additions & 0 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
// +kubebuilder:resource:path=infrastructures,scope=Cluster
// +kubebuilder:subresource:status
// +kubebuilder:metadata:annotations=release.openshift.io/bootstrap-required=true
// +openshift:validation:FeatureGateAwareXValidation:featureGate=MutableTopology,rule="!has(self.spec.controlPlaneTopology) || (has(oldSelf.spec.controlPlaneTopology) && self.spec.controlPlaneTopology == oldSelf.spec.controlPlaneTopology) || (has(self.status.controlPlaneTopology) && self.status.controlPlaneTopology == 'SingleReplica' && self.spec.controlPlaneTopology == 'HighlyAvailable')",message="spec.controlPlaneTopology can only be set to HighlyAvailable when status.controlPlaneTopology is SingleReplica"

@JoelSpeed JoelSpeed Jun 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably want to add a new clause here to allow spec to match status, that seems acceptable

type Infrastructure struct {
metav1.TypeMeta `json:",inline"`

Expand Down Expand Up @@ -55,6 +56,21 @@ type InfrastructureSpec struct {
// platformSpec holds desired information specific to the underlying
// infrastructure provider.
PlatformSpec PlatformSpec `json:"platformSpec,omitempty"`

// controlPlaneTopology expresses the desired topology configuration for control nodes.
//
// When status.controlPlaneTopology is 'SingleReplica' and spec.controlPlaneTopology is set to 'HighlyAvailable',
// a transition will be triggered to reconfigure the cluster from SingleReplica to HighlyAvailable.
//
// When left blank or status.controlPlaneTopology and spec.controlPlaneTopology are the same value,
// no changes are required and no transitions will be triggered.
//
// This value should only ever be set to SingleReplica if status.controlPlaneTopology is also set to SingleReplica.
//
// +openshift:enable:FeatureGate=MutableTopology
// +kubebuilder:validation:Enum=HighlyAvailable;SingleReplica
// +optional
ControlPlaneTopology TopologyMode `json:"controlPlaneTopology,omitempty"`
}

// InfrastructureStatus describes the infrastructure the cluster is leveraging.
Expand Down
2 changes: 1 addition & 1 deletion config/v1/types_infrastructure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

const (
infraCRDDefaultFilePath = "0000_10_config-operator_01_infrastructures-Default.crd.yaml"
infraCRDTestPreviewFilePath = "0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml"
infraCRDTestPreviewFilePath = "0000_10_config-operator_01_infrastructures-SelfManagedHA-TechPreviewNoUpgrade.crd.yaml"
)

// TestInfrastructureStatusDefault verifies that the infrastructure CR status does not have default value
Expand Down
Loading