Skip to content

Commit 8bb1ad2

Browse files
Used task resolver instead of ClusterTask
1 parent b114961 commit 8bb1ad2

Some content is hidden

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

50 files changed

+555
-804
lines changed

console-extensions.json

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -433,20 +433,6 @@
433433
"required": ["HIDE_STATIC_PIPELINE_PLUGIN_TASKRUNS_LIST"]
434434
}
435435
},
436-
{
437-
"type": "console.page/resource/list",
438-
"properties": {
439-
"model": {
440-
"group": "tekton.dev",
441-
"version": "v1beta1",
442-
"kind": "ClusterTask"
443-
},
444-
"component": { "$codeRef": "tasksComponent.ClusterTaskListPage" }
445-
},
446-
"flags": {
447-
"required": ["HIDE_STATIC_PIPELINE_PLUGIN_CLUSTERTASKS_LIST"]
448-
}
449-
},
450436
{
451437
"type": "console.page/resource/list",
452438
"properties": {
@@ -475,20 +461,6 @@
475461
"required": ["HIDE_STATIC_PIPELINE_PLUGIN_TASKRUNS_LIST"]
476462
}
477463
},
478-
{
479-
"type": "console.page/resource/list",
480-
"properties": {
481-
"model": {
482-
"group": "tekton.dev",
483-
"version": "v1",
484-
"kind": "ClusterTask"
485-
},
486-
"component": { "$codeRef": "tasksComponent.ClusterTaskListPage" }
487-
},
488-
"flags": {
489-
"required": ["HIDE_STATIC_PIPELINE_PLUGIN_CLUSTERTASKS_LIST"]
490-
}
491-
},
492464
{
493465
"type": "console.tab/horizontalNav",
494466
"properties": {
@@ -828,38 +800,6 @@
828800
"column": "right"
829801
}
830802
},
831-
{
832-
"type": "console.resource/details-item",
833-
"properties": {
834-
"id": "clustertasks-workspaces",
835-
"model": {
836-
"group": "tekton.dev",
837-
"version": "v1",
838-
"kind": "ClusterTask"
839-
},
840-
"component": {
841-
"$codeRef": "tasksComponent.WorkspaceDefinitionList"
842-
},
843-
"sortWeight": 1,
844-
"column": "right"
845-
}
846-
},
847-
{
848-
"type": "console.resource/details-item",
849-
"properties": {
850-
"id": "clustertasks-workspaces",
851-
"model": {
852-
"group": "tekton.dev",
853-
"version": "v1beta1",
854-
"kind": "ClusterTask"
855-
},
856-
"component": {
857-
"$codeRef": "tasksComponent.WorkspaceDefinitionList"
858-
},
859-
"sortWeight": 1,
860-
"column": "right"
861-
}
862-
},
863803
{
864804
"type": "console.page/resource/details",
865805
"properties": {

integration-tests/cypress/features/pipelines/create-from-builder-page.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Feature: Create the pipeline from builder page
328328
And user clicks Create Pipeline button
329329
And user clicks Add task button under Tasks section
330330
And user types 'git'
331-
Then user will see Task, clusterTask only
331+
Then user will see Task only
332332

333333

334334
@regression @manual

integration-tests/cypress/testData/customNodeDeployment.yaml

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,18 @@ spec:
3030
- name: revision
3131
value: $(params.GIT_REVISION)
3232
- name: subdirectory
33-
value: ''
33+
value: ""
3434
- name: deleteExisting
35-
value: 'true'
35+
value: "true"
3636
taskRef:
37-
kind: ClusterTask
38-
name: git-clone
37+
resolver: cluster
38+
params:
39+
- name: kind
40+
value: task
41+
- name: name
42+
value: git-clone
43+
- name: namespace
44+
value: openshift-pipelines
3945
workspaces:
4046
- name: output
4147
workspace: workspace
@@ -44,16 +50,22 @@ spec:
4450
- name: IMAGE
4551
value: $(params.IMAGE_NAME)
4652
- name: TLSVERIFY
47-
value: 'false'
53+
value: "false"
4854
- name: PATH_CONTEXT
4955
value: $(params.PATH_CONTEXT)
5056
- name: VERSION
5157
value: $(params.VERSION)
5258
runAfter:
5359
- fetch-repository
5460
taskRef:
55-
kind: ClusterTask
56-
name: s2i-nodejs
61+
resolver: cluster
62+
params:
63+
- name: kind
64+
value: task
65+
- name: name
66+
value: s2i-nodejs
67+
- name: namespace
68+
value: openshift-pipelines
5769
workspaces:
5870
- name: source
5971
workspace: workspace
@@ -64,7 +76,13 @@ spec:
6476
runAfter:
6577
- build
6678
taskRef:
67-
kind: ClusterTask
68-
name: openshift-client
79+
resolver: cluster
80+
params:
81+
- name: kind
82+
value: task
83+
- name: name
84+
value: openshift-client
85+
- name: namespace
86+
value: openshift-pipelines
6987
workspaces:
70-
- name: workspace
88+
- name: workspace

integration-tests/cypress/testData/customPythonDeploymentConfig.yaml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,18 @@ spec:
3030
- name: revision
3131
value: $(params.GIT_REVISION)
3232
- name: subdirectory
33-
value: ''
33+
value: ""
3434
- name: deleteExisting
35-
value: 'true'
35+
value: "true"
3636
taskRef:
37-
kind: ClusterTask
38-
name: git-clone
37+
resolver: cluster
38+
params:
39+
- name: kind
40+
value: task
41+
- name: name
42+
value: git-clone
43+
- name: namespace
44+
value: openshift-pipelines
3945
workspaces:
4046
- name: output
4147
workspace: workspace
@@ -44,16 +50,22 @@ spec:
4450
- name: IMAGE
4551
value: $(params.IMAGE_NAME)
4652
- name: TLSVERIFY
47-
value: 'false'
53+
value: "false"
4854
- name: PATH_CONTEXT
4955
value: $(params.PATH_CONTEXT)
5056
- name: VERSION
5157
value: $(params.VERSION)
5258
runAfter:
5359
- fetch-repository
5460
taskRef:
55-
kind: ClusterTask
56-
name: s2i-python
61+
resolver: cluster
62+
params:
63+
- name: kind
64+
value: task
65+
- name: name
66+
value: s2i-python
67+
- name: namespace
68+
value: openshift-pipelines
5769
workspaces:
5870
- name: source
5971
workspace: workspace
@@ -64,7 +76,13 @@ spec:
6476
runAfter:
6577
- build
6678
taskRef:
67-
kind: ClusterTask
68-
name: openshift-client
79+
resolver: cluster
80+
params:
81+
- name: kind
82+
value: task
83+
- name: name
84+
value: openshift-client
85+
- name: namespace
86+
value: openshift-pipelines
6987
workspaces:
7088
- name: workspace

integration-tests/cypress/testData/petclinic-pipeline-all.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,16 @@ spec:
400400
- name: revision
401401
value: $(params.APP_GIT_REVISION)
402402
- name: deleteExisting
403-
value: 'true'
403+
value: "true"
404404
taskRef:
405-
kind: ClusterTask
406-
name: git-clone
405+
resolver: cluster
406+
params:
407+
- name: kind
408+
value: task
409+
- name: name
410+
value: git-clone
411+
- name: namespace
412+
value: openshift-pipelines
407413
workspaces:
408414
- name: output
409415
workspace: app-source
@@ -427,7 +433,7 @@ spec:
427433
- name: build-image
428434
params:
429435
- name: TLSVERIFY
430-
value: 'false'
436+
value: "false"
431437
- name: OUTPUT_IMAGE_STREAM
432438
value: $(params.APP_IMAGE_STREAM)
433439
runAfter:
@@ -518,7 +524,7 @@ spec:
518524
description: The location of the path to run s2i from
519525
name: PATH_CONTEXT
520526
type: string
521-
- default: 'false'
527+
- default: "false"
522528
description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
523529
name: TLSVERIFY
524530
type: string

integration-tests/cypress/testData/pipelineWithParameterTypeArray.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,26 @@ metadata:
55
spec:
66
params:
77
- name: param1
8-
description: ''
8+
description: ""
99
default:
1010
- foo
1111
- bar
1212
- name: param2
13-
description: ''
13+
description: ""
1414
default: default1
1515
resources: []
1616
workspaces: []
1717
tasks:
1818
- name: kn
1919
taskRef:
20-
kind: ClusterTask
21-
name: kn
20+
resolver: cluster
21+
params:
22+
- name: kind
23+
value: task
24+
- name: name
25+
value: kn
26+
- name: namespace
27+
value: openshift-pipelines
2228
params:
2329
- name: kn-image
2430
value: >-

integration-tests/cypress/testData/pipelines-workspaces/pipeline-task-tkn.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

integration-tests/cypress/testData/pipelines-workspaces/pipeline-with-workspace.yaml

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)