Skip to content

Commit 3664be8

Browse files
waveywaveswaveywaves
committed
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.
1 parent a8a8c81 commit 3664be8

File tree

67 files changed

+119
-8217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+119
-8217
lines changed

‎cmd/webhook/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
5656
// v1beta1
5757
v1beta1.SchemeGroupVersion.WithKind("Pipeline"): &v1beta1.Pipeline{},
5858
v1beta1.SchemeGroupVersion.WithKind("Task"): &v1beta1.Task{},
59-
v1beta1.SchemeGroupVersion.WithKind("ClusterTask"): &v1beta1.ClusterTask{},
6059
v1beta1.SchemeGroupVersion.WithKind("TaskRun"): &v1beta1.TaskRun{},
6160
v1beta1.SchemeGroupVersion.WithKind("PipelineRun"): &v1beta1.PipelineRun{},
6261
v1beta1.SchemeGroupVersion.WithKind("CustomRun"): &v1beta1.CustomRun{},

‎config/200-clusterrole.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ rules:
3232
# Controller needs cluster access to all of the CRDs that it is responsible for
3333
# managing.
3434
- apiGroups: ["tekton.dev"]
35-
resources: ["tasks", "clustertasks", "taskruns", "pipelines", "pipelineruns", "customruns", "stepactions"]
35+
resources: ["tasks", "taskruns", "pipelines", "pipelineruns", "customruns", "stepactions"]
3636
verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
3737
- apiGroups: ["tekton.dev"]
3838
resources: ["verificationpolicies"]
@@ -41,7 +41,7 @@ rules:
4141
resources: ["taskruns/finalizers", "pipelineruns/finalizers", "customruns/finalizers"]
4242
verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
4343
- apiGroups: ["tekton.dev"]
44-
resources: ["tasks/status", "clustertasks/status", "taskruns/status", "pipelines/status", "pipelineruns/status", "customruns/status", "verificationpolicies/status", "stepactions/status"]
44+
resources: ["tasks/status", "taskruns/status", "pipelines/status", "pipelineruns/status", "customruns/status", "verificationpolicies/status", "stepactions/status"]
4545
verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
4646
# resolution.tekton.dev
4747
- apiGroups: ["resolution.tekton.dev"]
@@ -93,7 +93,6 @@ rules:
9393
- pipelines.tekton.dev
9494
- pipelineruns.tekton.dev
9595
- tasks.tekton.dev
96-
- clustertasks.tekton.dev
9796
- taskruns.tekton.dev
9897
- resolutionrequests.resolution.tekton.dev
9998
- customruns.tekton.dev
@@ -148,5 +147,5 @@ metadata:
148147
app.kubernetes.io/part-of: tekton-pipelines
149148
rules:
150149
- apiGroups: ["tekton.dev"]
151-
resources: ["tasks", "clustertasks", "taskruns", "pipelines", "pipelineruns", "customruns"]
150+
resources: ["tasks", "taskruns", "pipelines", "pipelineruns", "customruns"]
152151
verbs: ["get", "list", "watch"]

‎config/300-crds/300-clustertask.yaml

-4,492
This file was deleted.

‎config/300-crds/300-customrun.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ spec:
7474
description: |-
7575
TaskKind indicates the Kind of the Task:
7676
1. Namespaced Task when Kind is set to "Task". If Kind is "", it defaults to "Task".
77-
2. Cluster-Scoped Task when Kind is set to "ClusterTask"
78-
3. Custom Task when Kind is non-empty and APIVersion is non-empty
77+
2. Custom Task when Kind is non-empty and APIVersion is non-empty
7978
type: string
8079
name:
8180
description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'

‎config/300-crds/300-pipeline.yaml

+2-679
Large diffs are not rendered by default.

‎config/300-crds/300-taskrun.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1213,8 +1213,7 @@ spec:
12131213
description: |-
12141214
TaskKind indicates the Kind of the Task:
12151215
1. Namespaced Task when Kind is set to "Task". If Kind is "", it defaults to "Task".
1216-
2. Cluster-Scoped Task when Kind is set to "ClusterTask"
1217-
3. Custom Task when Kind is non-empty and APIVersion is non-empty
1216+
2. Custom Task when Kind is non-empty and APIVersion is non-empty
12181217
type: string
12191218
name:
12201219
description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'

‎docs/labels.md

+2-8
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ Tekton automatically adds labels to Tekton entities as described in the followin
6969
<td><code>Pods</code></td>
7070
<td>Name of the <code>Task</code> that the <code>TaskRun</code> references.</td>
7171
</tr>
72-
<tr>
73-
<td><code>tekton.dev/clusterTask</code></td>
74-
<td><code>TaskRuns</code> that reference an existing <code>ClusterTask</code>.</td>
75-
<td><code>Pods</code></td>
76-
<td>Name of the <code>ClusterTask</code> that the <code>TaskRun</code> references.</td>
77-
</tr>
7872
<tr>
7973
<td><code>tekton.dev/taskRun</code></td>
8074
<td><code>Pods</code></td>
@@ -112,10 +106,10 @@ The following command finds all `TaskRuns` that reference a `Task` named `test-t
112106
kubectl get taskruns --all-namespaces -l tekton.dev/task=test-task
113107
```
114108

115-
The following command finds all `TaskRuns` that reference a `ClusterTask` named `test-clustertask`:
109+
The following command finds all `PipelineRuns` that reference a `Pipeline` named `test-pipeline`:
116110

117111
```shell
118-
kubectl get taskruns --all-namespaces -l tekton.dev/clusterTask=test-clustertask
112+
kubectl get pipelinerun --all-namespaces -l tekton.dev/pipeline=test-pipeline
119113
```
120114

121115
## Annotations propagation

‎docs/pipeline-api.md

+4-221
Original file line numberDiff line numberDiff line change
@@ -5177,11 +5177,7 @@ failed step will not exit</p>
51775177
<th>Description</th>
51785178
</tr>
51795179
</thead>
5180-
<tbody><tr><td><p>&#34;ClusterTask&#34;</p></td>
5181-
<td><p>ClusterTaskRefKind is the task type for a reference to a task with cluster scope.
5182-
ClusterTasks are not supported in v1, but v1 types may reference ClusterTasks.</p>
5183-
</td>
5184-
</tr><tr><td><p>&#34;Task&#34;</p></td>
5180+
<tbody><tr><td><p>&#34;Task&#34;</p></td>
51855181
<td><p>NamespacedTaskKind indicates that the task type has a namespaced scope.</p>
51865182
</td>
51875183
</tr></tbody>
@@ -8480,8 +8476,6 @@ controller.</p>
84808476
</div>
84818477
Resource Types:
84828478
<ul><li>
8483-
<a href="#tekton.dev/v1beta1.ClusterTask">ClusterTask</a>
8484-
</li><li>
84858479
<a href="#tekton.dev/v1beta1.CustomRun">CustomRun</a>
84868480
</li><li>
84878481
<a href="#tekton.dev/v1beta1.Pipeline">Pipeline</a>
@@ -8494,216 +8488,6 @@ Resource Types:
84948488
</li><li>
84958489
<a href="#tekton.dev/v1beta1.TaskRun">TaskRun</a>
84968490
</li></ul>
8497-
<h3 id="tekton.dev/v1beta1.ClusterTask">ClusterTask
8498-
</h3>
8499-
<div>
8500-
<p>ClusterTask is a Task with a cluster scope. ClusterTasks are used to
8501-
represent Tasks that should be publicly addressable from any namespace in the
8502-
cluster.</p>
8503-
<p>Deprecated: Please use the cluster resolver instead.</p>
8504-
</div>
8505-
<table>
8506-
<thead>
8507-
<tr>
8508-
<th>Field</th>
8509-
<th>Description</th>
8510-
</tr>
8511-
</thead>
8512-
<tbody>
8513-
<tr>
8514-
<td>
8515-
<code>apiVersion</code><br/>
8516-
string</td>
8517-
<td>
8518-
<code>
8519-
tekton.dev/v1beta1
8520-
</code>
8521-
</td>
8522-
</tr>
8523-
<tr>
8524-
<td>
8525-
<code>kind</code><br/>
8526-
string
8527-
</td>
8528-
<td><code>ClusterTask</code></td>
8529-
</tr>
8530-
<tr>
8531-
<td>
8532-
<code>metadata</code><br/>
8533-
<em>
8534-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta">
8535-
Kubernetes meta/v1.ObjectMeta
8536-
</a>
8537-
</em>
8538-
</td>
8539-
<td>
8540-
<em>(Optional)</em>
8541-
Refer to the Kubernetes API documentation for the fields of the
8542-
<code>metadata</code> field.
8543-
</td>
8544-
</tr>
8545-
<tr>
8546-
<td>
8547-
<code>spec</code><br/>
8548-
<em>
8549-
<a href="#tekton.dev/v1beta1.TaskSpec">
8550-
TaskSpec
8551-
</a>
8552-
</em>
8553-
</td>
8554-
<td>
8555-
<em>(Optional)</em>
8556-
<p>Spec holds the desired state of the Task from the client</p>
8557-
<br/>
8558-
<br/>
8559-
<table>
8560-
<tr>
8561-
<td>
8562-
<code>resources</code><br/>
8563-
<em>
8564-
<a href="#tekton.dev/v1beta1.TaskResources">
8565-
TaskResources
8566-
</a>
8567-
</em>
8568-
</td>
8569-
<td>
8570-
<em>(Optional)</em>
8571-
<p>Resources is a list input and output resource to run the task
8572-
Resources are represented in TaskRuns as bindings to instances of
8573-
PipelineResources.</p>
8574-
<p>Deprecated: Unused, preserved only for backwards compatibility</p>
8575-
</td>
8576-
</tr>
8577-
<tr>
8578-
<td>
8579-
<code>params</code><br/>
8580-
<em>
8581-
<a href="#tekton.dev/v1beta1.ParamSpecs">
8582-
ParamSpecs
8583-
</a>
8584-
</em>
8585-
</td>
8586-
<td>
8587-
<em>(Optional)</em>
8588-
<p>Params is a list of input parameters required to run the task. Params
8589-
must be supplied as inputs in TaskRuns unless they declare a default
8590-
value.</p>
8591-
</td>
8592-
</tr>
8593-
<tr>
8594-
<td>
8595-
<code>displayName</code><br/>
8596-
<em>
8597-
string
8598-
</em>
8599-
</td>
8600-
<td>
8601-
<em>(Optional)</em>
8602-
<p>DisplayName is a user-facing name of the task that may be
8603-
used to populate a UI.</p>
8604-
</td>
8605-
</tr>
8606-
<tr>
8607-
<td>
8608-
<code>description</code><br/>
8609-
<em>
8610-
string
8611-
</em>
8612-
</td>
8613-
<td>
8614-
<em>(Optional)</em>
8615-
<p>Description is a user-facing description of the task that may be
8616-
used to populate a UI.</p>
8617-
</td>
8618-
</tr>
8619-
<tr>
8620-
<td>
8621-
<code>steps</code><br/>
8622-
<em>
8623-
<a href="#tekton.dev/v1beta1.Step">
8624-
[]Step
8625-
</a>
8626-
</em>
8627-
</td>
8628-
<td>
8629-
<p>Steps are the steps of the build; each step is run sequentially with the
8630-
source mounted into /workspace.</p>
8631-
</td>
8632-
</tr>
8633-
<tr>
8634-
<td>
8635-
<code>volumes</code><br/>
8636-
<em>
8637-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core">
8638-
[]Kubernetes core/v1.Volume
8639-
</a>
8640-
</em>
8641-
</td>
8642-
<td>
8643-
<p>Volumes is a collection of volumes that are available to mount into the
8644-
steps of the build.
8645-
See Pod.spec.volumes (API version: v1)</p>
8646-
</td>
8647-
</tr>
8648-
<tr>
8649-
<td>
8650-
<code>stepTemplate</code><br/>
8651-
<em>
8652-
<a href="#tekton.dev/v1beta1.StepTemplate">
8653-
StepTemplate
8654-
</a>
8655-
</em>
8656-
</td>
8657-
<td>
8658-
<p>StepTemplate can be used as the basis for all step containers within the
8659-
Task, so that the steps inherit settings on the base container.</p>
8660-
</td>
8661-
</tr>
8662-
<tr>
8663-
<td>
8664-
<code>sidecars</code><br/>
8665-
<em>
8666-
<a href="#tekton.dev/v1beta1.Sidecar">
8667-
[]Sidecar
8668-
</a>
8669-
</em>
8670-
</td>
8671-
<td>
8672-
<p>Sidecars are run alongside the Task&rsquo;s step containers. They begin before
8673-
the steps start and end after the steps complete.</p>
8674-
</td>
8675-
</tr>
8676-
<tr>
8677-
<td>
8678-
<code>workspaces</code><br/>
8679-
<em>
8680-
<a href="#tekton.dev/v1beta1.WorkspaceDeclaration">
8681-
[]WorkspaceDeclaration
8682-
</a>
8683-
</em>
8684-
</td>
8685-
<td>
8686-
<p>Workspaces are the volumes that this Task requires.</p>
8687-
</td>
8688-
</tr>
8689-
<tr>
8690-
<td>
8691-
<code>results</code><br/>
8692-
<em>
8693-
<a href="#tekton.dev/v1beta1.TaskResult">
8694-
[]TaskResult
8695-
</a>
8696-
</em>
8697-
</td>
8698-
<td>
8699-
<p>Results are values that this Task can output</p>
8700-
</td>
8701-
</tr>
8702-
</table>
8703-
</td>
8704-
</tr>
8705-
</tbody>
8706-
</table>
87078491
<h3 id="tekton.dev/v1beta1.CustomRun">CustomRun
87088492
</h3>
87098493
<div>
@@ -14985,7 +14769,7 @@ failed step will not exit</p>
1498514769
<h3 id="tekton.dev/v1beta1.TaskObject">TaskObject
1498614770
</h3>
1498714771
<div>
14988-
<p>TaskObject is implemented by Task and ClusterTask</p>
14772+
<p>TaskObject is implemented by Task</p>
1498914773
</div>
1499014774
<h3 id="tekton.dev/v1beta1.TaskRef">TaskRef
1499114775
</h3>
@@ -15026,8 +14810,7 @@ TaskKind
1502614810
<td>
1502714811
<p>TaskKind indicates the Kind of the Task:
1502814812
1. Namespaced Task when Kind is set to &ldquo;Task&rdquo;. If Kind is &ldquo;&rdquo;, it defaults to &ldquo;Task&rdquo;.
15029-
2. Cluster-Scoped Task when Kind is set to &ldquo;ClusterTask&rdquo;
15030-
3. Custom Task when Kind is non-empty and APIVersion is non-empty</p>
14813+
2. Custom Task when Kind is non-empty and APIVersion is non-empty</p>
1503114814
</td>
1503214815
</tr>
1503314816
<tr>
@@ -16075,7 +15858,7 @@ Kubernetes core/v1.ResourceRequirements
1607515858
<h3 id="tekton.dev/v1beta1.TaskSpec">TaskSpec
1607615859
</h3>
1607715860
<p>
16078-
(<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>)
15861+
(<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>)
1607915862
</p>
1608015863
<div>
1608115864
<p>TaskSpec defines the desired state of Task.</p>

0 commit comments

Comments
 (0)