Force cancel when using tkn pipelinerun cancel 👼

With tektoncd/pipeline#3915, there is now a
possibility to graceful cancel. As of today, the cli only supports
force cancelling.

When we updated the dependencies, we didn't change the constant we are
using from tektoncd/pipeline and thus, we were using the new value
that is only supported when alpha api are enabled — hence the CI is
broken.

This make the cli use the deprecated field for now, but we need to
follow up to support graceful cancellation.

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

internal/builder/v1alpha1/pipeline.go

@@ -113,7 +113,7 @@ func PipelineDescription(desc string) PipelineSpecOp {
 
 // PipelineRunCancelled sets the status to cancel to the TaskRunSpec.
 func PipelineRunCancelled(spec *v1alpha1.PipelineRunSpec) {
-	spec.Status = v1alpha1.PipelineRunSpecStatusCancelled
+	spec.Status = v1alpha1.PipelineRunSpecStatusCancelledDeprecated
 }
 
 // PipelineDeclaredResource adds a resource declaration to the Pipeline Spec,

internal/builder/v1beta1/pipeline.go

@@ -108,7 +108,7 @@ func PipelineDescription(desc string) PipelineSpecOp {
 
 // PipelineRunCancelled sets the status to cancel to the TaskRunSpec.
 func PipelineRunCancelled(spec *v1beta1.PipelineRunSpec) {
-	spec.Status = v1beta1.PipelineRunSpecStatusCancelled
+	spec.Status = v1beta1.PipelineRunSpecStatusCancelledDeprecated
 }
 
 // PipelineDeclaredResource adds a resource declaration to the Pipeline Spec,

pkg/cmd/pipeline/start_test.go

@@ -4538,7 +4538,7 @@ func Test_start_pipeline_use_pipelinerun_cancelled_status_v1beta1(t *testing.T)
 					},
 				},
 				Timeout: &metav1.Duration{Duration: timeoutDuration},
-				Status:  v1beta1.PipelineRunSpecStatus(v1beta1.PipelineRunSpecStatusCancelled),
+				Status:  v1beta1.PipelineRunSpecStatus(v1beta1.PipelineRunSpecStatusCancelledDeprecated),
 			},
 			Status: v1beta1.PipelineRunStatus{
 				Status: duckv1beta1.Status{

pkg/cmd/pipelinerun/cancel.go

@@ -74,7 +74,7 @@ func cancelPipelineRun(p cli.Params, s *cli.Stream, prName string) error {
 		}
 	}
 
-	if _, err = pipelinerun.Patch(cs, prName, metav1.PatchOptions{}, p.Namespace()); err != nil {
+	if _, err = pipelinerun.Cancel(cs, prName, metav1.PatchOptions{}, p.Namespace()); err != nil {
 		return fmt.Errorf("failed to cancel PipelineRun: %s: %v", prName, err)
 
 	}

pkg/pipelinerun/pipelinerun.go

@@ -149,11 +149,11 @@ type patchStringValue struct {
 	Value string `json:"value"`
 }
 
-func Patch(c *cli.Clients, prname string, opts metav1.PatchOptions, ns string) (*v1beta1.PipelineRun, error) {
+func Cancel(c *cli.Clients, prname string, opts metav1.PatchOptions, ns string) (*v1beta1.PipelineRun, error) {
 	payload := []patchStringValue{{
 		Op:    "replace",
 		Path:  "/spec/status",
-		Value: v1beta1.PipelineRunSpecStatusCancelled,
+		Value: v1beta1.PipelineRunSpecStatusCancelledDeprecated,
 	}}
 
 	data, _ := json.Marshal(payload)