Skip to content

OCPEDGE-2958: Add topologyTransitionStatus field to Infrastructure status #3026

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

Closed
copejon wants to merge 7 commits into from
Closed

OCPEDGE-2958: Add topologyTransitionStatus field to Infrastructure status #3026

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81cd0ca
define mutable topology transition statuses on infra config
copejon Sep 18, 2026
942ed22
change transition default status to "NotTransitioned" from "Idle". "I…
copejon Sep 21, 2026
bda6e95
codegen update
copejon Sep 21, 2026
9c93002
switch to using a struct to track transition status, reuse condition …
copejon Sep 23, 2026
f1a3c4d
code generation
copejon Sep 23, 2026
5b60da4
tweak Message godoc
copejon Sep 23, 2026
040afb4
rename to use State and TopologyTransitionState
copejon Sep 23, 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
41 changes: 41 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 @@ -138,6 +138,12 @@ type InfrastructureStatus struct {
// +optional
InfrastructureTopology TopologyMode `json:"infrastructureTopology,omitempty"`

// TopologyTransitionStatus reports the current status of the topology transition.
// When omitted, no topology transition status is reported.
// +openshift:enable:FeatureGate=MutableTopology
// +optional
TopologyTransitionStatus *TopologyTransitionStatus `json:"topologyTransitionStatus,omitempty"`

// cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster.
// CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets.
// Valid values are "None" and "AllNodes". When omitted, the default value is "None".
Expand Down Expand Up @@ -177,6 +183,41 @@ const (
ExternalTopologyMode TopologyMode = "External"
)

type TopologyTransitionStatus struct {
// Status is one of UnsupportedTransition, PreflightCheckFailed,
// TopologyTransitionInProgress, TopologyTransitionComplete, or AsExpected.
// +kubebuilder:validation:Enum=UnsupportedTransition;PreflightCheckFailed;TopologyTransitionInProgress;TopologyTransitionComplete;AsExpected
Status TopologyTransitionStatusFlag `json:"topologyTransitionStatusFlag,omitempty"`

@jeff-roche jeff-roche Sep 23, 2026 •
edited
Loading

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.

[nit] I don't love TopologyTransitionStatusFlag, what about TopologyTransitionState? Status would likely become State in that case


// Message is human readable information about the reason for the current status.
Message string `json:"message,omitempty"`
}

// TopologyTransitionStatusFlag tracks the last observed state of a topology transition
// requested via spec.controlPlaneTopology.
type TopologyTransitionStatusFlag string

const (
// TopologyTransitionStatusUnsupportedTransition indicates that the requested
// topology transition is not supported.
TopologyTransitionStatusUnsupportedTransition TopologyTransitionStatusFlag = "UnsupportedTransition"

// TopologyTransitionStatusPreflightCheckFailed indicates that a preflight
// check for the requested topology transition failed.
TopologyTransitionStatusPreflightCheckFailed TopologyTransitionStatusFlag = "PreflightCheckFailed"

// TopologyTransitionStatusInProgress indicates that a topology transition is
// currently in progress.
TopologyTransitionStatusInProgress TopologyTransitionStatusFlag = "TopologyTransitionInProgress"

// TopologyTransitionStatusComplete indicates that a topology transition has
// completed successfully.
TopologyTransitionStatusComplete TopologyTransitionStatusFlag = "TopologyTransitionComplete"

// TopologyTransitionStatusAsExpected indicates that no topology transition is in progress
TopologyTransitionStatusAsExpected TopologyTransitionStatusFlag = "AsExpected"
)

// CPUPartitioningMode defines the mode for CPU partitioning
type CPUPartitioningMode string

Expand Down
21 changes: 21 additions & 0 deletions ...-manifests/0000_10_config-operator_01_infrastructures-Hypershift-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2843,6 +2843,27 @@ spec:
rule: '!has(self.dnsRecordsType) || self.dnsRecordsType == ''Internal''
|| (has(self.loadBalancer) && self.loadBalancer.type == ''UserManaged'')'
type: object
topologyTransitionStatus:
description: |-
TopologyTransitionStatus reports the current status of the topology transition.
When omitted, no topology transition status is reported.
properties:
message:
description: Message is human readable information with a brief
statement of the reason for the current status.
type: string
topologyTransitionStatusFlag:
description: |-
Status is one of UnsupportedTransition, PreflightCheckFailed,
TopologyTransitionInProgress, TopologyTransitionComplete, or AsExpected.
enum:
- UnsupportedTransition
- PreflightCheckFailed
- TopologyTransitionInProgress
- TopologyTransitionComplete
- AsExpected
type: string
type: object
type: object
required:
- spec
Expand Down
21 changes: 21 additions & 0 deletions ...nifests/0000_10_config-operator_01_infrastructures-SelfManagedHA-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2843,6 +2843,27 @@ spec:
rule: '!has(self.dnsRecordsType) || self.dnsRecordsType == ''Internal''
|| (has(self.loadBalancer) && self.loadBalancer.type == ''UserManaged'')'
type: object
topologyTransitionStatus:
description: |-
TopologyTransitionStatus reports the current status of the topology transition.
When omitted, no topology transition status is reported.
properties:
message:
description: Message is human readable information with a brief
statement of the reason for the current status.
type: string
topologyTransitionStatusFlag:
description: |-
Status is one of UnsupportedTransition, PreflightCheckFailed,
TopologyTransitionInProgress, TopologyTransitionComplete, or AsExpected.
enum:
- UnsupportedTransition
- PreflightCheckFailed
- TopologyTransitionInProgress
- TopologyTransitionComplete
- AsExpected
type: string
type: object
type: object
required:
- spec
Expand Down
21 changes: 21 additions & 0 deletions ...sts/0000_10_config-operator_01_infrastructures-SelfManagedHA-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2843,6 +2843,27 @@ spec:
rule: '!has(self.dnsRecordsType) || self.dnsRecordsType == ''Internal''
|| (has(self.loadBalancer) && self.loadBalancer.type == ''UserManaged'')'
type: object
topologyTransitionStatus:
description: |-
TopologyTransitionStatus reports the current status of the topology transition.
When omitted, no topology transition status is reported.
properties:
message:
description: Message is human readable information with a brief
statement of the reason for the current status.
type: string
topologyTransitionStatusFlag:
description: |-
Status is one of UnsupportedTransition, PreflightCheckFailed,
TopologyTransitionInProgress, TopologyTransitionComplete, or AsExpected.
enum:
- UnsupportedTransition
- PreflightCheckFailed
- TopologyTransitionInProgress
- TopologyTransitionComplete
- AsExpected
type: string
type: object
type: object
required:
- spec
Expand Down
21 changes: 21 additions & 0 deletions config/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions ...rated.featuregated-crd-manifests/infrastructures.config.openshift.io/MutableTopology.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2431,6 +2431,27 @@ spec:
type: string
type: object
type: object
topologyTransitionStatus:
description: |-
TopologyTransitionStatus reports the current status of the topology transition.
When omitted, no topology transition status is reported.
properties:
message:
description: Message is human readable information with a brief
statement of the reason for the current status.
type: string
topologyTransitionStatusFlag:
description: |-
Status is one of UnsupportedTransition, PreflightCheckFailed,
TopologyTransitionInProgress, TopologyTransitionComplete, or AsExpected.
enum:
- UnsupportedTransition
- PreflightCheckFailed
- TopologyTransitionInProgress
- TopologyTransitionComplete
- AsExpected
type: string
type: object
type: object
required:
- spec
Expand Down
5 changes: 5 additions & 0 deletions config/v1/zz_generated.model_name.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 20 additions & 10 deletions config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions ...manifests/0000_80_machine-config_01_controllerconfigs-Hypershift-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3165,6 +3165,27 @@ spec:
== ''Internal'' || (has(self.loadBalancer) && self.loadBalancer.type
== ''UserManaged'')'
type: object
topologyTransitionStatus:
description: |-
TopologyTransitionStatus reports the current status of the topology transition.
When omitted, no topology transition status is reported.
properties:
message:
description: Message is human readable information with
a brief statement of the reason for the current status.
type: string
topologyTransitionStatusFlag:
description: |-
Status is one of UnsupportedTransition, PreflightCheckFailed,
TopologyTransitionInProgress, TopologyTransitionComplete, or AsExpected.
enum:
- UnsupportedTransition
- PreflightCheckFailed
- TopologyTransitionInProgress
- TopologyTransitionComplete
- AsExpected
type: string
type: object
type: object
required:
- spec
Expand Down
Loading