api: Make Machine IP a status field, not spec

Not really something specifiers decide.

Signed-off-by: Jakob Naucke <[email protected]>

Author: Jakob-Naucke

api/v1alpha1/crds.go

@@ -109,8 +109,6 @@ type MachineSpec struct {
 	// Machine ID, typically a UUID
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	Id *string `json:"id"`
-	// Machine address
-	Address *string `json:"address"`
 }
 
 // MachineStatus defines the observed state of Machine.
@@ -119,6 +117,9 @@ type MachineStatus struct {
 	// +listMapKey=type
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	// Machine address
+	// +optional
+	Address *string `json:"address,omitempty"`
 }
 
 // +kubebuilder:object:root=true

register-server/src/main.rs

@@ -18,7 +18,7 @@ use std::net::SocketAddr;
 use uuid::Uuid;
 use warp::{http::StatusCode, reply, Filter};
 
-use trusted_cluster_operator_lib::{Machine, MachineSpec, TrustedExecutionCluster};
+use trusted_cluster_operator_lib::*;
 
 #[derive(Parser)]
 #[command(name = "register-server")]
@@ -142,7 +142,8 @@ async fn create_machine(client: Client, uuid: &str, client_ip: &str) -> anyhow::
     let machine_list = machines.list(&Default::default()).await?;
 
     for existing_machine in machine_list.items {
-        if existing_machine.spec.address == client_ip {
+        let existing_address = existing_machine.status.and_then(|s| s.address);
+        if existing_address.map(|a| a == client_ip).unwrap_or(false) {
             if let Some(name) = &existing_machine.metadata.name {
                 info!("Found existing machine {name} with IP {client_ip}, deleting...");
                 machines.delete(name, &Default::default()).await?;
@@ -159,9 +160,11 @@ async fn create_machine(client: Client, uuid: &str, client_ip: &str) -> anyhow::
         },
         spec: MachineSpec {
             id: uuid.to_string(),
-            address: client_ip.to_string(),
         },
-        status: None,
+        status: Some(MachineStatus {
+            address: Some(client_ip.to_string()),
+            conditions: None,
+        }),
     };
 
     machines.create(&Default::default(), &machine).await?;