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

Co-authored-by: Tim Ebert <[email protected]>

Author: maboehm

Dockerfile

@@ -7,7 +7,7 @@ COPY . .
 RUN --mount=type=cache,target="/root/.cache/go-build" .ci/build
 
 #############      base                                     #############
-FROM gcr.io/distroless/static-debian12:nonroot as base
+FROM gcr.io/distroless/static-debian12:nonroot AS base
 WORKDIR /
 
 #############      machine-controller-manager               #############

docs/documents/apis.md

@@ -1543,8 +1543,8 @@ newest MachineSet.</p>
 </td>
 <td>
 <em>
-<a href="#machine.sapcloud.io/v1alpha1.*github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1.MachineSummary">
-[]*github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1.MachineSummary
+<a href="#machine.sapcloud.io/v1alpha1.*../../pkg/apis/machine/v1alpha1.MachineSummary">
+[]*../../pkg/apis/machine/v1alpha1.MachineSummary
 </a>
 </em>
 </td>
@@ -1988,8 +1988,8 @@ LastOperation
 </td>
 <td>
 <em>
-<a href="#machine.sapcloud.io/v1alpha1.[]github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1.MachineSummary">
-[]github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1.MachineSummary
+<a href="#machine.sapcloud.io/v1alpha1.[]../../pkg/apis/machine/v1alpha1.MachineSummary">
+[]../../pkg/apis/machine/v1alpha1.MachineSummary
 </a>
 </em>
 </td>
@@ -2121,6 +2121,23 @@ MachineConfiguration
 <tbody>
 <tr>
 <td>
+<code>addresses</code>
+</td>
+<td>
+<em>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#nodeaddress-v1-core">
+[]Kubernetes core/v1.NodeAddress
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>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 <code>Node.status.addresses</code> field.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>conditions</code>
 </td>
 <td>

kubernetes/crds/machine.sapcloud.io_machines.yaml

@@ -224,6 +224,25 @@ spec:
           status:
             description: Status contains fields depicting the status
             properties:
+              addresses:
+                description: |-
+                  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.
+                items:
+                  description: NodeAddress contains information for the node's address.
+                  properties:
+                    address:
+                      description: The node address.
+                      type: string
+                    type:
+                      description: Node address type, one of Hostname, ExternalIP
+                        or InternalIP.
+                      type: string
+                  required:
+                  - address
+                  - type
+                  type: object
+                type: array
               conditions:
                 description: Conditions of this machine, same as node
                 items:

pkg/apis/machine/types.go

@@ -162,6 +162,10 @@ type CurrentStatus struct {
 
 // MachineStatus holds the most recently observed status of Machine.
 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.
+	Addresses []corev1.NodeAddress
+
 	// Conditions of this machine, same as node
 	Conditions []corev1.NodeCondition
 

pkg/apis/machine/v1alpha1/machine_types.go

@@ -92,6 +92,11 @@ type NodeTemplateSpec struct {
 
 // MachineStatus holds the most recently observed status of Machine.
 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"`
+
 	// Conditions of this machine, same as node
 	Conditions []corev1.NodeCondition `json:"conditions,omitempty"`
 

pkg/apis/machine/v1alpha1/zz_generated.conversion.go

@@ -1,6 +1,7 @@
 API rule violation: list_type_missing,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineDeploymentStatus,Conditions
 API rule violation: list_type_missing,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineDeploymentStatus,FailedMachines
 API rule violation: list_type_missing,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineSetStatus,Conditions
+API rule violation: list_type_missing,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineStatus,Addresses
 API rule violation: list_type_missing,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineStatus,Conditions
 API rule violation: names_match,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineConfiguration,MachineCreationTimeout
 API rule violation: names_match,github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1,MachineConfiguration,MachineDrainTimeout