Skip to content

Commit da51826

Browse files
jakwegjakweg
authored
Remove references to cluster task (#1089)
Migrated the build process to use standard Tekton Task resources instead of the deprecated [ClusterTask](tektoncd/pipeline#4476). ## Proposed Changes * Remove any references to ClusterTask, this involved: * Updating build validation tests to use NamespacedTaskKind (Task) instead of ClusterTask. * Removing the obsolete logic for handling ClusterTask from the build reconciler. * Correcting outdated code comments that referred to ClusterTask. ## Release Notes <!-- kf follows the Keep A Changelog standard for release notes. https://keepachangelog.com/en/1.0.0/ Changelog entries should be one per line and start with one of the following words: `Added` for new features. `Changed` for changes in existing functionality. `Deprecated` for soon-to-be removed features. `Removed` for now removed features. `Fixed` for any bug fixes. `Security` in case of vulnerabilities. If one of the changes is breaking include that as a second word e.g. Removed BREAKING support for manifests v1 --> ```release-note Changed: Migrated the build process to use standard Tekton Task resources instead of the deprecated ClusterTask. ```
1 parent cd1e5f9 commit da51826

File tree

8 files changed

+22
-70
lines changed

8 files changed

+22
-70
lines changed

‎config/200-clusterrole.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ rules:
5353
resources: ["*", "*/status", "*/finalizers"]
5454
verbs: ["get", "list", "create", "update", "delete", "deletecollection", "patch", "watch"]
5555
- apiGroups: ["tekton.dev"]
56-
resources: ["taskruns", "clustertasks", "tasks", "pipelineruns"]
56+
resources: ["taskruns", "tasks", "pipelineruns"]
5757
verbs: ["get", "list", "create", "update", "delete", "patch", "watch"]
5858
- apiGroups: [""]
5959
resources: ["pods/log"]

‎pkg/apis/kf/v1alpha1/app_validation_test.go‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func TestApp_Validate(t *testing.T) {
160160
},
161161
},
162162
},
163-
want: ErrInvalidEnumValue("a-terrible-kind", "spec.build.spec.kind", []string{"Task", BuiltinTaskKind, "ClusterTask"}),
163+
want: ErrInvalidEnumValue("a-terrible-kind", "spec.build.spec.kind", []string{"Task", BuiltinTaskKind}),
164164
},
165165
"build image and buildRef": {
166166
spec: App{
@@ -282,7 +282,7 @@ func TestAppSpec_ValidateBuildSpec(t *testing.T) {
282282
},
283283
},
284284
},
285-
want: ErrInvalidEnumValue("a-terrible-kind", "spec.kind", []string{"Task", BuiltinTaskKind, "ClusterTask"}),
285+
want: ErrInvalidEnumValue("a-terrible-kind", "spec.kind", []string{"Task", BuiltinTaskKind}),
286286
},
287287
"build changed incorrectly": {
288288
old: &AppSpec{
@@ -337,31 +337,6 @@ func TestAppSpec_ValidateBuildSpec(t *testing.T) {
337337
},
338338
},
339339
},
340-
"Custom Builds Disabled, in update": {
341-
old: &AppSpec{
342-
Build: AppSpecBuild{
343-
UpdateRequests: 3,
344-
Spec: &BuildSpec{
345-
BuildTaskRef: BuildTaskRef{
346-
Name: "a-custom-name",
347-
Kind: string(tektonv1beta1.ClusterTaskKind),
348-
},
349-
},
350-
},
351-
},
352-
current: AppSpec{
353-
Build: AppSpecBuild{
354-
UpdateRequests: 4,
355-
Spec: &BuildSpec{
356-
BuildTaskRef: BuildTaskRef{
357-
Name: "a-different-name",
358-
Kind: string(tektonv1beta1.ClusterTaskKind),
359-
},
360-
},
361-
},
362-
},
363-
customBuildsDisabled: true,
364-
},
365340
"Custom Builds Disabled, in create": {
366341
current: AppSpec{
367342
Build: AppSpecBuild{

‎pkg/apis/kf/v1alpha1/build_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,18 +209,18 @@ func StringParam(key, value string) BuildParam {
209209
}
210210
}
211211

212-
// buildpackV3BuildTaskRef returns a BuildTaskRef for the buildpack ClusterTask.
212+
// buildpackV3BuildTaskRef returns a BuildTaskRef for the buildpack builtin task.
213213
func buildpackV3BuildTaskRef() BuildTaskRef {
214214
return builtinTaskRef(BuildpackV3BuildTaskName)
215215
}
216216

217-
// dockerfileBuildTaskRef returns a BuildTaskRef for the Dockerfile ClusterTask.
217+
// dockerfileBuildTaskRef returns a BuildTaskRef for the Dockerfile builtin task.
218218
func dockerfileBuildTaskRef() BuildTaskRef {
219219
return builtinTaskRef(DockerfileBuildTaskName)
220220
}
221221

222222
// buildpackV2BuildTaskRef returns a TaskRef for the Cloud Foundry Buildpacks
223-
// ClusterTask.
223+
// builtin task.
224224
func buildpackV2BuildTaskRef() BuildTaskRef {
225225
return builtinTaskRef(BuildpackV2BuildTaskName)
226226
}

‎pkg/apis/kf/v1alpha1/build_validation.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ func (spec *BuildSpec) Validate(ctx context.Context) (errs *apis.FieldError) {
4848

4949
validKinds := sets.NewString(
5050
string(tektonv1beta1.NamespacedTaskKind),
51-
string(tektonv1beta1.ClusterTaskKind),
5251
BuiltinTaskKind,
5352
)
5453

‎pkg/apis/kf/v1alpha1/build_validation_test.go‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ func TestBuild_Validate(t *testing.T) {
7272
want: ErrInvalidEnumValue("a-terrible-kind", "spec.kind", []string{
7373
string(tektonv1beta1.NamespacedTaskKind),
7474
BuiltinTaskKind,
75-
string(tektonv1beta1.ClusterTaskKind),
7675
}),
7776
},
7877
"missing name": {
@@ -83,7 +82,7 @@ func TestBuild_Validate(t *testing.T) {
8382
Spec: BuildSpec{
8483
BuildTaskRef: BuildTaskRef{
8584
Name: "",
86-
Kind: "ClusterTask",
85+
Kind: string(tektonv1beta1.NamespacedTaskKind),
8786
},
8887
},
8988
},
@@ -103,7 +102,6 @@ func TestBuild_Validate(t *testing.T) {
103102
want: ErrInvalidEnumValue("", "spec.kind", []string{
104103
string(tektonv1beta1.NamespacedTaskKind),
105104
BuiltinTaskKind,
106-
string(tektonv1beta1.ClusterTaskKind),
107105
}),
108106
},
109107
"has both SOURCE_IMAGE and SourcePackage": {
@@ -144,16 +142,6 @@ func TestBuildWithDisableCustomBuildsFlag_Validate(t *testing.T) {
144142
disableCustomBuilds bool
145143
want *apis.FieldError
146144
}{
147-
"custom builds disabled, Cluster Task": {
148-
spec: basicBuild(string(tektonv1beta1.ClusterTaskKind)),
149-
inCreate: true,
150-
disableCustomBuilds: true,
151-
want: apis.ErrGeneric(
152-
fmt.Sprintf("Custom Builds are disabled, kind must be %q but was %q",
153-
BuiltinTaskKind,
154-
string(tektonv1beta1.ClusterTaskKind)),
155-
"spec.kind"),
156-
},
157145
"custom builds disabled, Namespaced Task": {
158146
spec: basicBuild(string(tektonv1beta1.NamespacedTaskKind)),
159147
inCreate: true,
@@ -169,11 +157,6 @@ func TestBuildWithDisableCustomBuildsFlag_Validate(t *testing.T) {
169157
inCreate: true,
170158
disableCustomBuilds: true,
171159
},
172-
"custom builds enabled, ClusterTaskKind": {
173-
spec: basicBuild(string(tektonv1beta1.ClusterTaskKind)),
174-
inCreate: true,
175-
disableCustomBuilds: false,
176-
},
177160
"custom builds disabled, not in create, NamespacedTaskKind": {
178161
spec: basicBuild(string(tektonv1beta1.NamespacedTaskKind)),
179162
inCreate: false,
@@ -253,8 +236,8 @@ func TestBuildWithDockerfileBuildsFlag_Validate(t *testing.T) {
253236
inCreate: true,
254237
dockerfileBuildsEnabled: false,
255238
},
256-
"docker builds disabled, Cluster Task": {
257-
spec: basicBuildSpec("name", string(tektonv1beta1.ClusterTaskKind)),
239+
"docker builds disabled, Namespaced Task": {
240+
spec: basicBuildSpec("name", string(tektonv1beta1.NamespacedTaskKind)),
258241
inCreate: true,
259242
dockerfileBuildsEnabled: false,
260243
},
@@ -284,8 +267,8 @@ func TestBuildWithDockerfileBuildsFlag_Validate(t *testing.T) {
284267
inCreate: true,
285268
dockerfileBuildsEnabled: true,
286269
},
287-
"docker builds enabled, Cluster Task": {
288-
spec: basicBuildSpec("name", string(tektonv1beta1.ClusterTaskKind)),
270+
"docker builds enabled, Namespaced Task": {
271+
spec: basicBuildSpec("name", string(tektonv1beta1.NamespacedTaskKind)),
289272
inCreate: true,
290273
dockerfileBuildsEnabled: true,
291274
},
@@ -331,7 +314,7 @@ func TestBuildWithCustomBuildpacksAndStacksFlag_Validate(t *testing.T) {
331314
v3BuildCustomStack := BuildpackV3Build("some/source/image", basicStackV3("stack"), []string{})
332315
v3BuildInvalidParams := basicBuildSpec(BuildpackV3BuildTaskName, BuiltinTaskKind)
333316
docker := DockerfileBuild("some/source/image", "path/to/dockerfile")
334-
cluster := basicBuildSpec("name", string(tektonv1beta1.ClusterTaskKind))
317+
namespacedTask := basicBuildSpec("name", string(tektonv1beta1.NamespacedTaskKind))
335318

336319
cases := map[string]struct {
337320
spec BuildSpec
@@ -491,18 +474,18 @@ func TestBuildWithCustomBuildpacksAndStacksFlag_Validate(t *testing.T) {
491474
customBuildpacksEnabled: true,
492475
customStacksEnabled: false,
493476
},
494-
"Cluster Task, default": {
495-
spec: cluster,
477+
"Namespaced Task, default": {
478+
spec: namespacedTask,
496479
customBuildpacksEnabled: false,
497480
customStacksEnabled: true,
498481
},
499-
"Cluster Task, custom Buildpacks disabled": {
500-
spec: cluster,
482+
"Namespaced Task, custom Buildpacks disabled": {
483+
spec: namespacedTask,
501484
customBuildpacksEnabled: false,
502485
customStacksEnabled: true,
503486
},
504-
"Cluster Task, custom Stacks disabled": {
505-
spec: cluster,
487+
"Namespaced Task, custom Stacks disabled": {
488+
spec: namespacedTask,
506489
customBuildpacksEnabled: true,
507490
customStacksEnabled: false,
508491
},

‎pkg/kf/manifest/detection_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/google/kf/v2/pkg/apis/kf/config"
2222
"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
2323
"github.com/google/kf/v2/pkg/kf/testutil"
24+
tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
2425
)
2526

2627
func defaultV2Stack() config.StackV2Definition {
@@ -218,7 +219,7 @@ func TestDetectBuildType(t *testing.T) {
218219
Build: &v1alpha1.BuildSpec{
219220
BuildTaskRef: v1alpha1.BuildTaskRef{
220221
Name: "custom-task",
221-
Kind: "ClusterTask",
222+
Kind: string(tektonv1beta1.NamespacedTaskKind),
222223
APIVersion: "tekton.dev/v1beta1",
223224
},
224225
},
@@ -229,7 +230,7 @@ func TestDetectBuildType(t *testing.T) {
229230
expectedBuildSpec: &v1alpha1.BuildSpec{
230231
BuildTaskRef: v1alpha1.BuildTaskRef{
231232
Name: "custom-task",
232-
Kind: "ClusterTask",
233+
Kind: string(tektonv1beta1.NamespacedTaskKind),
233234
APIVersion: "tekton.dev/v1beta1",
234235
},
235236
Params: []v1alpha1.BuildParam{

‎pkg/reconciler/build/reconciler.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,6 @@ func (r *Reconciler) ApplyChanges(ctx context.Context, build *v1alpha1.Build) er
184184

185185
var taskSpec *tektonv1beta1.TaskSpec
186186
switch build.Spec.Kind {
187-
case string(tektonv1beta1.ClusterTaskKind):
188-
task, err := r.tektonClient.ClusterTasks().Get(ctx, build.Spec.Name, metav1.GetOptions{})
189-
if err != nil {
190-
return buildCondition.MarkReconciliationError(fmt.Sprintf("getting %s", tektonv1beta1.ClusterTaskKind), err)
191-
}
192-
taskSpec = &task.Spec
193187
case string(tektonv1beta1.NamespacedTaskKind):
194188
task, err := r.tektonClient.Tasks(build.Namespace).Get(ctx, build.Spec.Name, metav1.GetOptions{})
195189
if err != nil {

‎pkg/reconciler/build/resources/task_run_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func exampleCustomTaskBuild() (*v1alpha1.Build, *tektonv1beta1.TaskSpec) {
6868
build.UID = "0d5c53ff-edf1-4d42-8d1a-fdd5b5cf23d3"
6969
build.Namespace = "my-namespace"
7070
build.Spec.Name = "buildpack"
71-
build.Spec.Kind = "ClusterTask"
71+
build.Spec.Kind = string(tektonv1beta1.NamespacedTaskKind)
7272

7373
build.Spec.Params = []v1alpha1.BuildParam{
7474
{

0 commit comments

Comments
 (0)