Merge pull request #13 from yasun1/last_updated_at

Standardize AdapterStatus Timestamp 'last_updated_at' Naming

Author: rh-amarin

models/clusters/model.tsp

@@ -52,11 +52,12 @@ model ClusterStatus {
 
   /** Time of the last update
    * Updated when conditions are reported.
-   * Most recent `last_updated_time` from the conditions
+   * Computed as min(conditions[].last_updated_time) to detect stale adapters.
+   * Uses earliest (not latest) timestamp to ensure Sentinel can detect if any adapter has stopped reporting.
    */
   @format("date-time") last_updated_time: string;
 
-  conditions: Condition[];
+  conditions: ResourceCondition[];
 }
 
 @example(exampleCluster)

models/nodepools/model.tsp

@@ -45,11 +45,12 @@ model NodePoolStatus {
 
   /** Time of the last update
    * Updated when conditions are reported.
-   * Most recent `last_updated_time` from the conditions
+   * Computed as min(conditions[].last_updated_time) to detect stale adapters.
+   * Uses earliest (not latest) timestamp to ensure Sentinel can detect if any adapter has stopped reporting.
    */
   @format("date-time") last_updated_time: string;
 
-  conditions: Condition[];
+  conditions: ResourceCondition[];
 }
 
 @example(exampleNodePool)

models/statuses/example_adapter_status.tsp

@@ -10,29 +10,20 @@ const exampleAdapterStatus: AdapterStatus = (#{
       status: "True",
       reason: "All validations passed",
       message: "All 30 validation tests passed",
-      observed_generation: 1,
-      created_time: "2021-01-01T10:00:00Z",
-      last_updated_time: "2021-01-01T10:00:00Z",
       last_transition_time: "2021-01-01T10:00:00Z",
     },
     #{
       type: "Applied",
       status: "True",
       reason: "Validation job applied",
       message: "Validation job applied successfully",
-      observed_generation: 1,
-      created_time: "2021-01-01T10:00:00Z",
-      last_updated_time: "2021-01-01T10:00:00Z",
       last_transition_time: "2021-01-01T10:00:00Z",
     },
     #{
       type: "Health",
       status: "True",
       reason: "Validation job healthy",
       message: "Validation job is healthy",
-      observed_generation: 1,
-      created_time: "2021-01-01T10:00:00Z",
-      last_updated_time: "2021-01-01T10:00:00Z",
       last_transition_time: "2021-01-01T10:00:00Z",
     }
   ],
@@ -52,37 +43,32 @@ const exampleAdapterStatus: AdapterStatus = (#{
     },
   },
   created_time: "2021-01-01T10:00:00Z",
-  last_updated_time: "2021-01-01T10:02:00Z",
+  last_report_time: "2021-01-01T10:02:00Z",
 });
 
 // Example AdapterStatusCreateRequest (for POST /clusters/{id}/statuses)
 const exampleAdapterStatusCreateRequest: AdapterStatusCreateRequest = (#{
   adapter: "validator",
   observed_generation: 1,
+  observed_time: "2021-01-01T10:00:00Z",
   conditions: #[
     #{
       type: "Available",
       status: "True",
       reason: "All validations passed",
       message: "All 30 validation tests passed",
-      observed_generation: 1,
-      observed_time: "2021-01-01T10:00:00Z",
     },
     #{
       type: "Applied",
       status: "True",
       reason: "Validation job applied",
       message: "Validation job applied successfully",
-      observed_generation: 1,
-      observed_time: "2021-01-01T10:00:00Z",
     },
     #{
       type: "Health",
       status: "True",
       reason: "Validation job healthy",
       message: "Validation job is healthy",
-      observed_generation: 1,
-      observed_time: "2021-01-01T10:00:00Z",
     }
   ],
   metadata: #{
@@ -118,9 +104,6 @@ const exampleAdapterStatusList: AdapterStatusList = (#{
           status: "True",
           reason: "All validations passed",
           message: "All 30 validation tests passed",
-          observed_generation: 1,
-          created_time: "2021-01-01T10:00:00Z",
-          last_updated_time: "2021-01-01T10:00:00Z",
           last_transition_time: "2021-01-01T10:00:00Z",
         },
       ],
@@ -129,7 +112,7 @@ const exampleAdapterStatusList: AdapterStatusList = (#{
         duration: "2m",
       },
       created_time: "2021-01-01T10:00:00Z",
-      last_updated_time: "2021-01-01T10:02:00Z",
+      last_report_time: "2021-01-01T10:02:00Z",
     },
     #{
       adapter: "dns",
@@ -140,14 +123,11 @@ const exampleAdapterStatusList: AdapterStatusList = (#{
           status: "True",
           reason: "DNS configured",
           message: "DNS records created",
-          observed_generation: 1,
-          created_time: "2021-01-01T10:01:00Z",
-          last_updated_time: "2021-01-01T10:01:00Z",
           last_transition_time: "2021-01-01T10:01:00Z",
         },
       ],
       created_time: "2021-01-01T10:01:00Z",
-      last_updated_time: "2021-01-01T10:01:30Z",
+      last_report_time: "2021-01-01T10:01:30Z",
     },
   ],
 });

models/statuses/model.tsp

@@ -2,15 +2,11 @@ import "../common/model.tsp";
 import "./example_adapter_status.tsp";
 
 /**
- * Condition represents a single status condition
- * Used in both AdapterStatus.conditions[] (with standard types like "Available")
- * and ClusterStatus.conditions[] (with semantic types like "ValidationSuccessful", "DNSSuccessful", etc.)
+ * Base condition fields shared by all condition types
  */
-model Condition {
+model ConditionBase {
   /**
    * Condition type
-   * In AdapterStatus: Standard Kubernetes types ("Available", "Applied", "Health")
-   * In ClusterStatus: Semantic types ("ValidationSuccessful", "DNSSuccessful", "NodePoolSuccessful", etc.)
    */
   type: string;
 
@@ -29,6 +25,29 @@ model Condition {
    */
   message?: string;
 
+  /**
+   * When this condition last transitioned status (API-managed)
+   * Only updated when status changes (True/False/Unknown), not when reason/message changes
+   */
+  @format("date-time") last_transition_time: string;
+}
+
+/**
+ * Condition in AdapterStatus
+ * Used for standard Kubernetes condition types: "Available", "Applied", "Health"
+ * Note: observed_generation is at AdapterStatus level, not per-condition,
+ * since all conditions in one AdapterStatus share the same observed generation
+ */
+model AdapterCondition extends ConditionBase {
+  // No additional fields - inherits all fields from ConditionBase
+}
+
+/**
+ * Condition in Cluster/NodePool status
+ * Used for semantic condition types: "ValidationSuccessful", "DNSSuccessful", "NodePoolSuccessful", etc.
+ * Includes observed_generation and last_updated_time to track adapter-specific state
+ */
+model ResourceCondition extends ConditionBase {
   /**
    * Generation of the spec that this condition reflects
    */
@@ -40,39 +59,28 @@ model Condition {
   @format("date-time") created_time: string;
 
   /**
-   * When this condition was last updated (API-managed)
+   * When the corresponding adapter last reported (API-managed)
+   * Updated every time the adapter POSTs, even if condition status hasn't changed
+   * Copied from AdapterStatus.last_report_time
    */
   @format("date-time") last_updated_time: string;
-
-  /**
-   * When this condition last transitioned status (API-managed)
-   */
-  @format("date-time") last_transition_time?: string;
 }
 
 /**
  * Condition data for create/update requests (from adapters)
+ * observed_generation and observed_time are now at AdapterStatusCreateRequest level
  */
 model ConditionRequest {
   type: string;
   status: "True" | "False" | "Unknown";
   reason?: string;
   message?: string;
-  observed_generation: int32;
-
-  /**
-   * When the adapter observed this condition
-   * API will use this to set created_time, last_updated_time, last_transition_time
-   */
-  @format("date-time") observed_time: string;
 }
 
 /**
- * AdapterStatus represents the complete status report from an adapter
- * Contains multiple conditions, job metadata, and adapter-specific data
+ * Base fields shared by AdapterStatus and AdapterStatusCreateRequest
  */
-@example(exampleAdapterStatus)
-model AdapterStatus {
+model AdapterStatusBase {
   /**
    * Adapter name (e.g., "validator", "dns", "provisioner")
    */
@@ -83,12 +91,6 @@ model AdapterStatus {
    */
   observed_generation: int32;
 
-  /**
-   * Kubernetes-style conditions tracking adapter state
-   * Typically includes: Available, Applied, Health
-   */
-  conditions: Condition[];
-
   /**
    * Job execution metadata
    */
@@ -105,35 +107,45 @@ model AdapterStatus {
    * Adapter-specific data (structure varies by adapter type)
    */
   data?: Record<unknown>;
+}
+
+/**
+ * AdapterStatus represents the complete status report from an adapter
+ * Contains multiple conditions, job metadata, and adapter-specific data
+ */
+@example(exampleAdapterStatus)
+model AdapterStatus extends AdapterStatusBase {
+  /**
+   * Kubernetes-style conditions tracking adapter state
+   * Typically includes: Available, Applied, Health
+   */
+  conditions: AdapterCondition[];
 
   /**
    * When this adapter status was first created (API-managed)
    */
   @format("date-time") created_time: string;
 
   /**
-   * When this adapter status was last updated (API-managed)
+   * When this adapter last reported its status (API-managed)
+   * Updated every time the adapter POSTs, even if conditions haven't changed
+   * Used by Sentinel to detect adapter liveness
    */
-  @format("date-time") last_updated_time: string;
+  @format("date-time") last_report_time: string;
 }
 
 /**
  * Request payload for creating/updating adapter status
  */
 @example(exampleAdapterStatusCreateRequest)
-model AdapterStatusCreateRequest {
-  adapter: string;
-  observed_generation: int32;
+model AdapterStatusCreateRequest extends AdapterStatusBase {
+  /**
+   * When the adapter observed this resource state
+   * API will use this to set AdapterStatus.last_report_time
+   */
+  @format("date-time") observed_time: string;
+
   conditions: ConditionRequest[];
-  metadata?: {
-    job_name?: string;
-    job_namespace?: string;
-    attempt?: int32;
-    @format("date-time") started_time?: string;
-    @format("date-time") completed_time?: string;
-    duration?: string;
-  };
-  data?: Record<unknown>;
 }
 
 /**