Add observedGeneration to remote nodes

ytsaurus · Nov 5, 2024 · 5d45249 · 5d45249
1 parent 98d988a
commit 5d45249
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 1 deletion.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -605,7 +605,9 @@ const (
 // CommonRemoteNodeStatus is a set of fields shared between `Remote*NodesStatus`.
 // It is inlined in these specs.
 type CommonRemoteNodeStatus struct {
-	ReleaseStatus RemoteNodeReleaseStatus `json:"releaseStatus,omitempty"`
+	// Reflects resource generation which was used for updating status.
+	ObservedGeneration int64                   `json:"observedGeneration,omitempty"`
+	ReleaseStatus      RemoteNodeReleaseStatus `json:"releaseStatus,omitempty"`
 }
 
 // YtsaurusSpec defines the desired state of Ytsaurus

diff --git a/config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml
@@ -2507,6 +2507,11 @@ spec:
           status:
             description: RemoteDataNodesStatus defines the observed state of RemoteDataNodes
             properties:
+              observedGeneration:
+                description: Reflects resource generation which was used for updating
+                  status.
+                format: int64
+                type: integer
               releaseStatus:
                 type: string
             type: object

diff --git a/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml
@@ -2700,6 +2700,11 @@ spec:
           status:
             description: RemoteExecNodesStatus defines the observed state of RemoteExecNodes
             properties:
+              observedGeneration:
+                description: Reflects resource generation which was used for updating
+                  status.
+                format: int64
+                type: integer
               releaseStatus:
                 type: string
             type: object

diff --git a/config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml
@@ -2507,6 +2507,11 @@ spec:
           status:
             description: RemoteTabletNodesStatus defines the observed state of RemoteTabletNodes
             properties:
+              observedGeneration:
+                description: Reflects resource generation which was used for updating
+                  status.
+                format: int64
+                type: integer
               releaseStatus:
                 type: string
             type: object

diff --git a/controllers/remotedatanodes_sync.go b/controllers/remotedatanodes_sync.go
@@ -56,6 +56,7 @@ func (r *RemoteDataNodesReconciler) Sync(
 		resource.Status.ReleaseStatus = ytv1.RemoteNodeReleaseStatusRunning
 		requeue = false
 	}
+	resource.Status.ObservedGeneration = resource.Generation
 
 	logger.Info("Setting status for remote data nodes", "status", resource.Status.ReleaseStatus)
 	err = r.Client.Status().Update(ctx, resource)

diff --git a/controllers/remoteexecnodes_sync.go b/controllers/remoteexecnodes_sync.go
@@ -56,6 +56,7 @@ func (r *RemoteExecNodesReconciler) Sync(
 		resource.Status.ReleaseStatus = ytv1.RemoteNodeReleaseStatusRunning
 		requeue = false
 	}
+	resource.Status.ObservedGeneration = resource.Generation
 
 	logger.Info("Setting status for remote exec nodes", "status", resource.Status.ReleaseStatus)
 	err = r.Client.Status().Update(ctx, resource)

diff --git a/controllers/remotetabletnodes_sync.go b/controllers/remotetabletnodes_sync.go
@@ -56,6 +56,7 @@ func (r *RemoteTabletNodesReconciler) Sync(
 		resource.Status.ReleaseStatus = ytv1.RemoteNodeReleaseStatusRunning
 		requeue = false
 	}
+	resource.Status.ObservedGeneration = resource.Generation
 
 	logger.Info("Setting status for remote tablet nodes", "status", resource.Status.ReleaseStatus)
 	err = r.Client.Status().Update(ctx, resource)

diff --git a/docs/api.md b/docs/api.md
@@ -289,6 +289,7 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
+| `observedGeneration` _integer_ | Reflects resource generation which was used for updating status. |  |  |
 | `releaseStatus` _[RemoteNodeReleaseStatus](#remotenodereleasestatus)_ |  |  |  |
 
 

diff --git a/ytop-chart/templates/crds/remotedatanodes.cluster.ytsaurus.tech.yaml b/ytop-chart/templates/crds/remotedatanodes.cluster.ytsaurus.tech.yaml
@@ -2518,6 +2518,11 @@ spec:
           status:
             description: RemoteDataNodesStatus defines the observed state of RemoteDataNodes
             properties:
+              observedGeneration:
+                description: Reflects resource generation which was used for updating
+                  status.
+                format: int64
+                type: integer
               releaseStatus:
                 type: string
             type: object

diff --git a/ytop-chart/templates/crds/remoteexecnodes.cluster.ytsaurus.tech.yaml b/ytop-chart/templates/crds/remoteexecnodes.cluster.ytsaurus.tech.yaml
@@ -2711,6 +2711,11 @@ spec:
           status:
             description: RemoteExecNodesStatus defines the observed state of RemoteExecNodes
             properties:
+              observedGeneration:
+                description: Reflects resource generation which was used for updating
+                  status.
+                format: int64
+                type: integer
               releaseStatus:
                 type: string
             type: object

diff --git a/ytop-chart/templates/crds/remotetabletnodes.cluster.ytsaurus.tech.yaml b/ytop-chart/templates/crds/remotetabletnodes.cluster.ytsaurus.tech.yaml
@@ -2518,6 +2518,11 @@ spec:
           status:
             description: RemoteTabletNodesStatus defines the observed state of RemoteTabletNodes
             properties:
+              observedGeneration:
+                description: Reflects resource generation which was used for updating
+                  status.
+                format: int64
+                type: integer
               releaseStatus:
                 type: string
             type: object