Revert "Update Controller To Track Action Progress (#1487)" (#1577)

This reverts commit 2fd28db.

pkg/apis/cr/v1alpha1/types.go

@@ -109,10 +109,9 @@ type ActionSpec struct {
 
 // ActionSetStatus is the status for the actionset. This should only be updated by the controller.
 type ActionSetStatus struct {
-	State    State          `json:"state"`
-	Actions  []ActionStatus `json:"actions,omitempty"`
-	Error    Error          `json:"error,omitempty"`
-	Progress ActionProgress `json:"progress,omitempty"`
+	State   State          `json:"state"`
+	Actions []ActionStatus `json:"actions,omitempty"`
+	Error   Error          `json:"error,omitempty"`
 }
 
 // ActionStatus is updated as we execute phases.
@@ -132,16 +131,6 @@ type ActionStatus struct {
 	DeferPhase Phase `json:"deferPhase,omitempty"`
 }
 
-// ActionProgress provides information on the progress of an action.
-type ActionProgress struct {
-	// PercentCompleted is computed by assessing the number of completed phases
-	// against the the total number of phases.
-	PercentCompleted string `json:"percentCompleted"`
-	// LastTransitionTime represents the last date time when the progress status
-	// was received.
-	LastTransitionTime metav1.Time `json:"lastTransitionTime"`
-}
-
 // State is the current state of a phase of execution.
 type State string
 

pkg/controller/controller.go

@@ -49,7 +49,6 @@ import (
 	"github.com/kanisterio/kanister/pkg/field"
 	"github.com/kanisterio/kanister/pkg/log"
 	"github.com/kanisterio/kanister/pkg/param"
-	"github.com/kanisterio/kanister/pkg/progress"
 	"github.com/kanisterio/kanister/pkg/reconcile"
 	"github.com/kanisterio/kanister/pkg/validate"
 	osversioned "github.com/openshift/client-go/apps/clientset/versioned"
@@ -377,14 +376,6 @@ func (c *Controller) handleActionSet(as *crv1alpha1.ActionSet) (err error) {
 		}
 	}
 
-	go func() {
-		// progress update is computed on a best-effort basis.
-		// if it exits with error, we will just log it.
-		if err := progress.TrackActionsProgress(ctx, c.crClient, as.GetName(), as.GetNamespace()); err != nil {
-			log.Error().WithError(err)
-		}
-	}()
-
 	for i := range as.Status.Actions {
 		if err = c.runAction(ctx, as, i); err != nil {
 			// If runAction returns an error, it is a failure in the synchronous

pkg/customresource/actionset.yaml

@@ -172,14 +172,6 @@ spec:
             description: ActionSetStatus is the status for the actionset. This should
               only be updated by the controller.
             properties:
-              progress:
-                properties:
-                  percentCompleted:
-                    type: string
-                  lastTransitionTime:
-                    type: string
-                    format: date-time
-                type: object
               actions:
                 items:
                   properties:
@@ -261,20 +253,6 @@ spec:
                 type: string
             type: object
         type: object
-    additionalPrinterColumns:
-    - name: Progress
-      type: string
-      description: Progress of completion in percentage
-      jsonPath: .status.progress.percentCompleted
-    - name: Last Transition Time
-      type: string
-      format: date-time
-      description: Progress last transition time
-      jsonPath: .status.progress.lastTransitionTime
-    - name: State
-      type: string
-      description: State of the actionset
-      jsonPath: .status.state
 status:
   acceptedNames:
     kind: ""