feat(omnictl): show node name and locked status in cluster status#2923
Merged
Conversation
Member
Author
|
before/after: What Changed:
|
a31f948 to
39bdca9
Compare
Unix4ever
approved these changes
Jun 2, 2026
There was a problem hiding this comment.
Pull request overview
Adds the friendly Kubernetes node name (in parentheses after the machine UUID) and a dedicated "Locked" indicator to each machine line shown by omnictl cluster status, so operators can correlate UUID-based listings with name-based status messages, and removes the redundant "(Machine Locked)" suffix from the pending-config-update string.
Changes:
- Added
clusterMachineNodeNameStringhelper that readsClusterMachineStatusLabelNodeNameand renders(node-name)(or empty when not yet joined). - Added
clusterMachineLockedStringhelper that emits a blueLockedwhenever theMachineLockedannotation is present on theClusterMachineStatus. - Updated the
ClusterMachineStatusrendering format to include both new pieces, and simplified the existing pending-update message to justPending Config Update.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| client/pkg/template/operations/internal/statustree/statustree.go | Extended format string and argument list to insert node name after the UUID and a Locked indicator before config status. |
| client/pkg/template/operations/internal/statustree/helpers.go | New clusterMachineNodeNameString and clusterMachineLockedString helpers; trimmed redundant "(Machine Locked)" wording. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
39bdca9 to
094818a
Compare
The `omnictl cluster status` tree listed machines by UUID only, while the Talos/Kubernetes upgrade status messages referenced the friendly Kubernetes node name, making it hard to correlate which machine a status line was about. A locked machine was also only surfaced when it additionally had a pending config update. Render the node name (from the ClusterMachineStatusLabelNodeName label already on the resource) in parentheses after the UUID, and show a dedicated "Locked" indicator whenever the MachineLocked annotation is set, e.g. `Machine "0000...edb"(omni-foo-abcdef) Running Ready Locked`. Machines that have not yet joined Kubernetes show no node name rather than empty parentheses. Closes #1700 Signed-off-by: Fritz Schaal <fritz.schaal@siderolabs.com>
094818a to
ccbc50b
Compare
Member
Author
|
/m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
omnictl cluster statustree listed machines by UUID only, whilethe Talos/Kubernetes upgrade status messages referenced the friendly
Kubernetes node name, making it hard to correlate which machine a
status line was about. A locked machine was also only surfaced when it
additionally had a pending config update.
Render the node name (from the ClusterMachineStatusLabelNodeName label
already on the resource) in parentheses after the UUID, and show a
dedicated "Locked" indicator whenever the MachineLocked annotation is
set, e.g.
Machine "0000...edb"(omni-foo-abcdef) Running Ready Locked.Machines that have not yet joined Kubernetes show no node name rather
than empty parentheses.
Closes #1700
Signed-off-by: Fritz Schaal fritz.schaal@siderolabs.com
Note that this is AI tooling assisted code.