Skip to content

[GEP-28] Report Machine.status.addresses when running without target cluster #1012

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

Merged
aaronfern merged 8 commits into from
Aug 14, 2025
Merged

[GEP-28] Report Machine.status.addresses when running without target cluster #1012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e61f802
Add Addresses field to machine status
maboehm Jul 7, 2025
7e3b43f
Report addresses in machine status
maboehm Jul 7, 2025
f1721c0
fix Dockerfile casing to avoid warning
maboehm Jul 7, 2025
ef5307a
Apply suggestions from code review
maboehm Jul 9, 2025
c232334
PR feedback
maboehm Jul 11, 2025
ede84ae
collect addresses as a map
maboehm Jul 30, 2025
cb6071b
return response in initializeMachine
maboehm Jul 30, 2025
1504d92
use apimachinery sets
maboehm Aug 5, 2025
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
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@maboehm
maboehm committed Jul 11, 2025
commit c232334c8a5981b7ab6cba5ae7ff82bf8f3876c5
3 changes: 1 addition & 2 deletions pkg/apis/machine/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ type CurrentStatus struct {
type MachineStatus struct {
// Addresses of this machines. This field is only present if the MCM provider runs without a target cluster and may
// be used by clients to determine how to connect to the machine, instead of the `Node.status.addresses` field.
// +optional
Addresses []corev1.NodeAddress `json:"addresses,omitempty"`
Addresses []corev1.NodeAddress

// Conditions of this machine, same as node
Conditions []corev1.NodeCondition
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/provider/machinecontroller/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ func (c *controller) triggerCreationFlow(ctx context.Context, createMachineReque
var clone *v1alpha1.Machine
clone, err = c.updateLabels(ctx, createMachineRequest.Machine, nodeName, providerID)
if err != nil {
klog.V(2).Infof("failed to update labels and providerID for machine %q. err=%q", machine.Name, err.Error())
klog.Errorf("failed to update labels and providerID for machine %q. err=%q", machine.Name, err.Error())
}
//initialize VM if not initialized
if uninitializedMachine {
Expand All @@ -651,7 +651,7 @@ func (c *controller) triggerCreationFlow(ctx context.Context, createMachineReque
addresses = append(addresses, initAddresses...)
clone.Status.Addresses = buildAddressStatus(addresses, nodeName)
if _, err := c.controlMachineClient.Machines(clone.Namespace).UpdateStatus(ctx, clone, metav1.UpdateOptions{}); err != nil {
return 0, fmt.Errorf("failed to persist status addresses after initialization was successful: %w", err)
return machineutils.ShortRetry, fmt.Errorf("failed to persist status addresses after initialization was successful: %w", err)
}
}

Expand Down