Remove deprecated uuid field from ServerSpec

api/v1alpha1/server_types.go

@@ -77,11 +77,6 @@ type BootOrder struct {
 
 // ServerSpec defines the desired state of a Server.
 type ServerSpec struct {
-	// UUID is the unique identifier for the server.
-	// Deprecated in favor of systemUUID.
-	// +optional
-	UUID string `json:"uuid,omitempty"`
-
 	// SystemUUID is the unique identifier for the server.
 	// +required
 	SystemUUID string `json:"systemUUID"`

config/crd/bases/metal.ironcore.dev_servers.yaml

@@ -294,11 +294,6 @@ spec:
               systemUUID:
                 description: SystemUUID is the unique identifier for the server.
                 type: string
-              uuid:
-                description: |-
-                  UUID is the unique identifier for the server.
-                  Deprecated in favor of systemUUID.
-                type: string
             required:
             - systemUUID
             type: object

config/samples/metal_v1alpha1_server.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/created-by: metal-operator
   name: endpoint-sample-system-0
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000001"
   bmcRef:
     name: bmc-sample
   power: "Off"

config/samples/topology/rack1/server1.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "1"
   name: server-1-1
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000101"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server10.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "10"
   name: server-1-10
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000110"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server2.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "2"
   name: server-1-2
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000102"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server3.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "3"
   name: server-1-3
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000103"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server4.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "4"
   name: server-1-4
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000104"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server5.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "5"
   name: server-1-5
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000105"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server6.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "6"
   name: server-1-6
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000106"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server7.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "7"
   name: server-1-7
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000107"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server8.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "8"
   name: server-1-8
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000108"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack1/server9.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "9"
   name: server-1-9
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000109"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server1.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "1"
   name: server-2-1
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000201"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server10.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "10"
   name: server-2-10
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000210"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server2.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "2"
   name: server-2-2
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000202"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server3.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "3"
   name: server-2-3
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000203"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server4.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "4"
   name: server-2-4
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000204"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server5.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "5"
   name: server-2-5
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000205"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server6.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "6"
   name: server-2-6
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000206"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server7.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "7"
   name: server-2-7
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000207"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server8.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "8"
   name: server-2-8
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000208"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack2/server9.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "9"
   name: server-2-9
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000209"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server1.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "1"
   name: server-3-1
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000301"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server10.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "10"
   name: server-3-10
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000310"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server2.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "2"
   name: server-3-2
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000302"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server3.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "3"
   name: server-3-3
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000303"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server4.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "4"
   name: server-3-4
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000304"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server5.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "5"
   name: server-3-5
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000305"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server6.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "6"
   name: server-3-6
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000306"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server7.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "7"
   name: server-3-7
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000307"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server8.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "8"
   name: server-3-8
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000308"
   bmcRef:
     name: sample-bmc
   power: "Off"

config/samples/topology/rack3/server9.yaml

@@ -6,7 +6,7 @@ metadata:
     topology.metal.ironcore.dev/heightunit: "9"
   name: server-3-9
 spec:
-  uuid: "12345"
+  systemUUID: "00000000-0000-0000-0000-000000000309"
   bmcRef:
     name: sample-bmc
   power: "Off"

dist/chart/templates/crd/metal.ironcore.dev_servers.yaml

@@ -300,11 +300,6 @@ spec:
               systemUUID:
                 description: SystemUUID is the unique identifier for the server.
                 type: string
-              uuid:
-                description: |-
-                  UUID is the unique identifier for the server.
-                  Deprecated in favor of systemUUID.
-                type: string
             required:
             - systemUUID
             type: object

docs/api-reference/api.md

@@ -1556,7 +1556,6 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `uuid` _string_ | UUID is the unique identifier for the server.<br />Deprecated in favor of systemUUID. |  |  |
 | `systemUUID` _string_ | SystemUUID is the unique identifier for the server. |  |  |
 | `systemURI` _string_ | SystemURI is the unique URI for the server resource in REDFISH API. |  |  |
 | `power` _[Power](#power)_ | Power specifies the desired power state of the server. |  |  |

docs/concepts/servers.md

@@ -13,7 +13,7 @@ kind: Server
 metadata:
   name: my-server
 spec:
-  uuid: "123e4567-e89b-12d3-a456-426614174000"
+  systemUUID: "123e4567-e89b-12d3-a456-426614174000"
   power: "Off"
   bmcRef:
     name: my-bmc
@@ -103,7 +103,7 @@ kind: Server
 metadata:
   name: server-with-bmc-ref
 spec:
-  uuid: "123e4567-e89b-12d3-a456-426614174000"
+  systemUUID: "123e4567-e89b-12d3-a456-426614174000"
   power: "On"
   bmcRef:
     name: my-bmc

docs/development/dev_setup.md

@@ -62,7 +62,7 @@ This `Makefile` directive will:
 
 ```shell
 ‹kind-metal› kubectl get server
-NAME                            UUID                                   MANUFACTURER   POWERSTATE   STATE       AGE
+NAME                            SYSTEMUUID                             MANUFACTURER   POWERSTATE   STATE       AGE
 compute-0-bmc-endpoint-sample   38947555-7742-3448-3784-823347823834   Contoso        On           Available   3m21s
 ```
 

internal/controller/bmc_controller.go

@@ -268,7 +268,6 @@ func (r *BMCReconciler) discoverServers(ctx context.Context, bmcClient bmc.BMC,
 		server.Name = bmcutils.GetServerNameFromBMCandIndex(i, bmcObj)
 		opResult, err := controllerutil.CreateOrPatch(ctx, r.Client, server, func() error {
 			metautils.SetLabels(server, bmcObj.Labels)
-			server.Spec.UUID = ""
 			server.Spec.SystemUUID = strings.ToLower(s.UUID)
 			server.Spec.SystemURI = s.URI
 			server.Spec.BMCRef = &corev1.LocalObjectReference{Name: bmcObj.Name}