extend ping action flow

Author: jwierzbo

pkg/apis/deployment/v1/arango_task_spec.go

@@ -73,8 +73,8 @@ var _ json.Unmarshaler = &ArangoTaskDetails{}
 var _ json.Marshaler = ArangoTaskDetails{}
 
 type ArangoTaskSpec struct {
-	Type           ArangoTaskType    `json:"type,required"`
-	DeploymentName string            `json:"deploymentName,required"`
+	Type           ArangoTaskType    `json:"type"`
+	DeploymentName string            `json:"deploymentName"`
 	Details        ArangoTaskDetails `json:"details,omitempty"`
 }
 

pkg/apis/deployment/v2alpha1/arango_task_spec.go

@@ -73,8 +73,8 @@ var _ json.Unmarshaler = &ArangoTaskDetails{}
 var _ json.Marshaler = ArangoTaskDetails{}
 
 type ArangoTaskSpec struct {
-	Type           ArangoTaskType    `json:"type,required"`
-	DeploymentName string            `json:"deploymentName,required"`
+	Type           ArangoTaskType    `json:"type"`
+	DeploymentName string            `json:"deploymentName"`
 	Details        ArangoTaskDetails `json:"details,omitempty"`
 }
 

pkg/deployment/reconcile/action_ping.go

@@ -22,6 +22,7 @@ package reconcile
 
 import (
 	"context"
+	"time"
 
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
 )
@@ -52,5 +53,38 @@ func (a *pingAction) Start(ctx context.Context) (bool, error) {
 }
 
 func (a *pingAction) CheckProgress(ctx context.Context) (bool, bool, error) {
+	if a.action.TaskID == "" {
+		a.log.Error("taskName parameter is missing")
+		return false, true, nil
+	}
+
+	tasksCache, err := a.actionCtx.ACS().Cache().ArangoTask().V1()
+	if err != nil {
+		a.log.Err(err).Error("Failed to get ArangoTask cache")
+		return false, false, err
+	}
+
+	task, exist := tasksCache.GetSimpleByID(a.action.TaskID)
+	if !exist {
+		a.log.Error("ArangoTask not found")
+		return false, false, err
+	}
+
+	if task.Spec.Details != nil {
+		pingBody := api.ArangoTaskPing{}
+		if err := task.Spec.Details.Get(&pingBody); err != nil {
+			a.log.Err(err).Error("Failed to parse ArangoTaskPing content")
+			return false, false, err
+		}
+
+		if pingBody.DurationSeconds != 0 {
+			a.log.Info("Checking ArangoTaskPing duration limits")
+			upTo := a.action.CreationTime.Add(time.Duration(pingBody.DurationSeconds) * time.Second)
+			if time.Now().Before(upTo) {
+				return false, false, nil
+			}
+		}
+	}
+
 	return true, false, nil
 }

pkg/deployment/reconcile/plan_executor.go

@@ -396,6 +396,10 @@ func (d *Reconciler) updateTaskStatus(ctx context.Context, action api.Action, st
 
 	task.Status.State = state
 
+	if task.Status.AcceptedSpec == nil {
+		task.Status.AcceptedSpec = &task.Spec
+	}
+
 	ind := sort.Search(len(task.Status.ActionsState), func(i int) bool {
 		return task.Status.ActionsState[i].ActionId == action.ID
 	})