cleanup: remove deprecated clustertask source

as clustertasks are already deprecated, this commit ensures that the implmentation of clustertask CRD, reconciliation etc. is removed whilst ensuring that the tests use tasks instead of clustertasks.
tektoncd · Mar 4, 2025 · 37ff332 · 37ff332
1 parent 25a6227
commit 37ff332
Show file tree

Hide file tree

Showing 61 changed files with 75 additions and 2,417 deletions.
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -56,7 +56,6 @@ var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
 	// v1beta1
 	v1beta1.SchemeGroupVersion.WithKind("Pipeline"):    &v1beta1.Pipeline{},
 	v1beta1.SchemeGroupVersion.WithKind("Task"):        &v1beta1.Task{},
-	v1beta1.SchemeGroupVersion.WithKind("ClusterTask"): &v1beta1.ClusterTask{},
 	v1beta1.SchemeGroupVersion.WithKind("TaskRun"):     &v1beta1.TaskRun{},
 	v1beta1.SchemeGroupVersion.WithKind("PipelineRun"): &v1beta1.PipelineRun{},
 	v1beta1.SchemeGroupVersion.WithKind("CustomRun"):   &v1beta1.CustomRun{},

diff --git a/config/200-clusterrole.yaml b/config/200-clusterrole.yaml
@@ -32,7 +32,7 @@ rules:
     # Controller needs cluster access to all of the CRDs that it is responsible for
     # managing.
   - apiGroups: ["tekton.dev"]
-    resources: ["tasks", "clustertasks", "taskruns", "pipelines", "pipelineruns", "customruns", "stepactions"]
+    resources: ["tasks", "taskruns", "pipelines", "pipelineruns", "customruns", "stepactions"]
     verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
   - apiGroups: ["tekton.dev"]
     resources: ["verificationpolicies"]
@@ -41,7 +41,7 @@ rules:
     resources: ["taskruns/finalizers", "pipelineruns/finalizers", "customruns/finalizers"]
     verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
   - apiGroups: ["tekton.dev"]
-    resources: ["tasks/status", "clustertasks/status", "taskruns/status", "pipelines/status", "pipelineruns/status", "customruns/status", "verificationpolicies/status", "stepactions/status"]
+    resources: ["tasks/status", "taskruns/status", "pipelines/status", "pipelineruns/status", "customruns/status", "verificationpolicies/status", "stepactions/status"]
     verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
   # resolution.tekton.dev
   - apiGroups: ["resolution.tekton.dev"]
@@ -93,7 +93,6 @@ rules:
       - pipelines.tekton.dev
       - pipelineruns.tekton.dev
       - tasks.tekton.dev
-      - clustertasks.tekton.dev
       - taskruns.tekton.dev
       - resolutionrequests.resolution.tekton.dev
       - customruns.tekton.dev
@@ -148,5 +147,5 @@ metadata:
     app.kubernetes.io/part-of: tekton-pipelines
 rules:
   - apiGroups: ["tekton.dev"]
-    resources: ["tasks", "clustertasks", "taskruns", "pipelines", "pipelineruns", "customruns"]
+    resources: ["tasks", "taskruns", "pipelines", "pipelineruns", "customruns"]
     verbs: ["get", "list", "watch"]
diff --git a/docs/pipeline-api.md b/docs/pipeline-api.md
@@ -5170,11 +5170,7 @@ failed step will not exit</p>
 <th>Description</th>
 </tr>
 </thead>
-<tbody><tr><td><p>&#34;ClusterTask&#34;</p></td>
-<td><p>ClusterTaskRefKind is the task type for a reference to a task with cluster scope.
-ClusterTasks are not supported in v1, but v1 types may reference ClusterTasks.</p>
-</td>
-</tr><tr><td><p>&#34;Task&#34;</p></td>
+<tbody><tr><td><p>&#34;Task&#34;</p></td>
 <td><p>NamespacedTaskKind indicates that the task type has a namespaced scope.</p>
 </td>
 </tr></tbody>
@@ -8470,8 +8466,6 @@ controller.</p>
 </div>
 Resource Types:
 <ul><li>
-<a href="#tekton.dev/v1beta1.ClusterTask">ClusterTask</a>
-</li><li>
 <a href="#tekton.dev/v1beta1.CustomRun">CustomRun</a>
 </li><li>
 <a href="#tekton.dev/v1beta1.Pipeline">Pipeline</a>
@@ -8484,215 +8478,6 @@ Resource Types:
 </li><li>
 <a href="#tekton.dev/v1beta1.TaskRun">TaskRun</a>
 </li></ul>
-<h3 id="tekton.dev/v1beta1.ClusterTask">ClusterTask
-</h3>
-<div>
-<p>ClusterTask is a Task with a cluster scope. ClusterTasks are used to
-represent Tasks that should be publicly addressable from any namespace in the
-cluster.</p>
-<p>Deprecated: Please use the cluster resolver instead.</p>
-</div>
-<table>
-<thead>
-<tr>
-<th>Field</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>
-<code>apiVersion</code><br/>
-string</td>
-<td>
-<code>
-tekton.dev/v1beta1
-</code>
-</td>
-</tr>
-<tr>
-<td>
-<code>kind</code><br/>
-string
-</td>
-<td><code>ClusterTask</code></td>
-</tr>
-<tr>
-<td>
-<code>metadata</code><br/>
-<em>
-<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta">
-Kubernetes meta/v1.ObjectMeta
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-Refer to the Kubernetes API documentation for the fields of the
-<code>metadata</code> field.
-</td>
-</tr>
-<tr>
-<td>
-<code>spec</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.TaskSpec">
-TaskSpec
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Spec holds the desired state of the Task from the client</p>
-<br/>
-<br/>
-<table>
-<tr>
-<td>
-<code>resources</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.TaskResources">
-TaskResources
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Resources is a list input and output resource to run the task
-Resources are represented in TaskRuns as bindings to instances of
-PipelineResources.</p>
-<p>Deprecated: Unused, preserved only for backwards compatibility</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>params</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.ParamSpecs">
-ParamSpecs
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Params is a list of input parameters required to run the task. Params
-must be supplied as inputs in TaskRuns unless they declare a default
-value.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>displayName</code><br/>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>DisplayName is a user-facing name of the task that may be
-used to populate a UI.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>description</code><br/>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Description is a user-facing description of the task that may be
-used to populate a UI.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>steps</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.Step">
-[]Step
-</a>
-</em>
-</td>
-<td>
-<p>Steps are the steps of the build; each step is run sequentially with the
-source mounted into /workspace.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>volumes</code><br/>
-<em>
-<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core">
-[]Kubernetes core/v1.Volume
-</a>
-</em>
-</td>
-<td>
-<p>Volumes is a collection of volumes that are available to mount into the
-steps of the build.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>stepTemplate</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.StepTemplate">
-StepTemplate
-</a>
-</em>
-</td>
-<td>
-<p>StepTemplate can be used as the basis for all step containers within the
-Task, so that the steps inherit settings on the base container.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>sidecars</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.Sidecar">
-[]Sidecar
-</a>
-</em>
-</td>
-<td>
-<p>Sidecars are run alongside the Task&rsquo;s step containers. They begin before
-the steps start and end after the steps complete.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>workspaces</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.WorkspaceDeclaration">
-[]WorkspaceDeclaration
-</a>
-</em>
-</td>
-<td>
-<p>Workspaces are the volumes that this Task requires.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>results</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.TaskResult">
-[]TaskResult
-</a>
-</em>
-</td>
-<td>
-<p>Results are values that this Task can output</p>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
 <h3 id="tekton.dev/v1beta1.CustomRun">CustomRun
 </h3>
 <div>
@@ -14967,7 +14752,7 @@ failed step will not exit</p>
 <h3 id="tekton.dev/v1beta1.TaskObject">TaskObject
 </h3>
 <div>
-<p>TaskObject is implemented by Task and ClusterTask</p>
+<p>TaskObject is implemented by Task</p>
 </div>
 <h3 id="tekton.dev/v1beta1.TaskRef">TaskRef
 </h3>
@@ -15008,8 +14793,7 @@ TaskKind
 <td>
 <p>TaskKind indicates the Kind of the Task:
 1. Namespaced Task when Kind is set to &ldquo;Task&rdquo;. If Kind is &ldquo;&rdquo;, it defaults to &ldquo;Task&rdquo;.
-2. Cluster-Scoped Task when Kind is set to &ldquo;ClusterTask&rdquo;
-3. Custom Task when Kind is non-empty and APIVersion is non-empty</p>
+2. Custom Task when Kind is non-empty and APIVersion is non-empty</p>
 </td>
 </tr>
 <tr>
@@ -16054,7 +15838,7 @@ Kubernetes core/v1.ResourceRequirements
 <h3 id="tekton.dev/v1beta1.TaskSpec">TaskSpec
 </h3>
 <p>
-(<em>Appears on:</em><a href="#tekton.dev/v1beta1.ClusterTask">ClusterTask</a>, <a href="#tekton.dev/v1beta1.Task">Task</a>, <a href="#tekton.dev/v1beta1.EmbeddedTask">EmbeddedTask</a>, <a href="#tekton.dev/v1beta1.TaskRunSpec">TaskRunSpec</a>, <a href="#tekton.dev/v1beta1.TaskRunStatusFields">TaskRunStatusFields</a>)
+(<em>Appears on:</em><a href="#tekton.dev/v1beta1.Task">Task</a>, <a href="#tekton.dev/v1beta1.EmbeddedTask">EmbeddedTask</a>, <a href="#tekton.dev/v1beta1.TaskRunSpec">TaskRunSpec</a>, <a href="#tekton.dev/v1beta1.TaskRunStatusFields">TaskRunStatusFields</a>)
 </p>
 <div>
 <p>TaskSpec defines the desired state of Task.</p>

diff --git a/examples/v1beta1/pipelineruns/clustertask-pipelinerun.yaml b/examples/v1beta1/pipelineruns/clustertask-pipelinerun.yaml
diff --git a/examples/v1beta1/taskruns/clustertask.yaml b/examples/v1beta1/taskruns/clustertask.yaml
diff --git a/examples/v1beta1/taskruns/image-params.yaml b/examples/v1beta1/taskruns/image-params.yaml
diff --git a/examples/v1beta1/taskruns/no-ci/.keep b/examples/v1beta1/taskruns/no-ci/.keep
diff --git a/pkg/apis/pipeline/controller.go b/pkg/apis/pipeline/controller.go
@@ -29,9 +29,6 @@ const (
 	// TaskControllerName holds the name of the Task controller
 	TaskControllerName = "Task"
 
-	// ClusterTaskControllerName holds the name of the Task controller
-	ClusterTaskControllerName = "ClusterTask"
-
 	// RunControllerName holds the name of the Custom Task controller
 	RunControllerName = "Run"