Merge pull request #174 from lokanandaprabhu/feature/using-task-resolver

SRVKP-6463: Use Tasks from the `openshift-pipelines` namespace instead of ClusterTask
openshift-pipelines · Nov 8, 2024 · 2408b0c · 2408b0c
2 parents 3831426 + 8bb1ad2
commit 2408b0c
Show file tree

Hide file tree

Showing 50 changed files with 555 additions and 804 deletions.
diff --git a/console-extensions.json b/console-extensions.json
@@ -433,20 +433,6 @@
       "required": ["HIDE_STATIC_PIPELINE_PLUGIN_TASKRUNS_LIST"]
     }
   },
-  {
-    "type": "console.page/resource/list",
-    "properties": {
-      "model": {
-        "group": "tekton.dev",
-        "version": "v1beta1",
-        "kind": "ClusterTask"
-      },
-      "component": { "$codeRef": "tasksComponent.ClusterTaskListPage" }
-    },
-    "flags": {
-      "required": ["HIDE_STATIC_PIPELINE_PLUGIN_CLUSTERTASKS_LIST"]
-    }
-  },
   {
     "type": "console.page/resource/list",
     "properties": {
@@ -475,20 +461,6 @@
       "required": ["HIDE_STATIC_PIPELINE_PLUGIN_TASKRUNS_LIST"]
     }
   },
-  {
-    "type": "console.page/resource/list",
-    "properties": {
-      "model": {
-        "group": "tekton.dev",
-        "version": "v1",
-        "kind": "ClusterTask"
-      },
-      "component": { "$codeRef": "tasksComponent.ClusterTaskListPage" }
-    },
-    "flags": {
-      "required": ["HIDE_STATIC_PIPELINE_PLUGIN_CLUSTERTASKS_LIST"]
-    }
-  },
   {
     "type": "console.tab/horizontalNav",
     "properties": {
@@ -828,38 +800,6 @@
       "column": "right"
     }
   },
-  {
-    "type": "console.resource/details-item",
-    "properties": {
-      "id": "clustertasks-workspaces",
-      "model": {
-        "group": "tekton.dev",
-        "version": "v1",
-        "kind": "ClusterTask"
-      },
-      "component": {
-        "$codeRef": "tasksComponent.WorkspaceDefinitionList"
-      },
-      "sortWeight": 1,
-      "column": "right"
-    }
-  },
-  {
-    "type": "console.resource/details-item",
-    "properties": {
-      "id": "clustertasks-workspaces",
-      "model": {
-        "group": "tekton.dev",
-        "version": "v1beta1",
-        "kind": "ClusterTask"
-      },
-      "component": {
-        "$codeRef": "tasksComponent.WorkspaceDefinitionList"
-      },
-      "sortWeight": 1,
-      "column": "right"
-    }
-  },
   {
     "type": "console.page/resource/details",
     "properties": {

diff --git a/integration-tests/cypress/features/pipelines/create-from-builder-page.feature b/integration-tests/cypress/features/pipelines/create-from-builder-page.feature
@@ -328,7 +328,7 @@ Feature: Create the pipeline from builder page
               And user clicks Create Pipeline button
               And user clicks Add task button under Tasks section
               And user types 'git'
-             Then user will see Task, clusterTask only
+             Then user will see Task only
 
 
         @regression @manual

diff --git a/integration-tests/cypress/testData/customNodeDeployment.yaml b/integration-tests/cypress/testData/customNodeDeployment.yaml
@@ -30,12 +30,18 @@ spec:
         - name: revision
           value: $(params.GIT_REVISION)
         - name: subdirectory
-          value: ''
+          value: ""
         - name: deleteExisting
-          value: 'true'
+          value: "true"
       taskRef:
-        kind: ClusterTask
-        name: git-clone
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: git-clone
+          - name: namespace
+            value: openshift-pipelines
       workspaces:
         - name: output
           workspace: workspace
@@ -44,16 +50,22 @@ spec:
         - name: IMAGE
           value: $(params.IMAGE_NAME)
         - name: TLSVERIFY
-          value: 'false'
+          value: "false"
         - name: PATH_CONTEXT
           value: $(params.PATH_CONTEXT)
         - name: VERSION
           value: $(params.VERSION)
       runAfter:
         - fetch-repository
       taskRef:
-        kind: ClusterTask
-        name: s2i-nodejs
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: s2i-nodejs
+          - name: namespace
+            value: openshift-pipelines
       workspaces:
         - name: source
           workspace: workspace
@@ -64,7 +76,13 @@ spec:
       runAfter:
         - build
       taskRef:
-        kind: ClusterTask
-        name: openshift-client
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: openshift-client
+          - name: namespace
+            value: openshift-pipelines
   workspaces:
-    - name: workspace
+    - name: workspace
diff --git a/integration-tests/cypress/testData/customPythonDeploymentConfig.yaml b/integration-tests/cypress/testData/customPythonDeploymentConfig.yaml
@@ -30,12 +30,18 @@ spec:
         - name: revision
           value: $(params.GIT_REVISION)
         - name: subdirectory
-          value: ''
+          value: ""
         - name: deleteExisting
-          value: 'true'
+          value: "true"
       taskRef:
-        kind: ClusterTask
-        name: git-clone
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: git-clone
+          - name: namespace
+            value: openshift-pipelines
       workspaces:
         - name: output
           workspace: workspace
@@ -44,16 +50,22 @@ spec:
         - name: IMAGE
           value: $(params.IMAGE_NAME)
         - name: TLSVERIFY
-          value: 'false'
+          value: "false"
         - name: PATH_CONTEXT
           value: $(params.PATH_CONTEXT)
         - name: VERSION
           value: $(params.VERSION)
       runAfter:
         - fetch-repository
       taskRef:
-        kind: ClusterTask
-        name: s2i-python
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: s2i-python
+          - name: namespace
+            value: openshift-pipelines
       workspaces:
         - name: source
           workspace: workspace
@@ -64,7 +76,13 @@ spec:
       runAfter:
         - build
       taskRef:
-        kind: ClusterTask
-        name: openshift-client
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: openshift-client
+          - name: namespace
+            value: openshift-pipelines
   workspaces:
     - name: workspace
diff --git a/integration-tests/cypress/testData/petclinic-pipeline-all.yaml b/integration-tests/cypress/testData/petclinic-pipeline-all.yaml
@@ -400,10 +400,16 @@ spec:
         - name: revision
           value: $(params.APP_GIT_REVISION)
         - name: deleteExisting
-          value: 'true'
+          value: "true"
       taskRef:
-        kind: ClusterTask
-        name: git-clone
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: git-clone
+          - name: namespace
+            value: openshift-pipelines
       workspaces:
         - name: output
           workspace: app-source
@@ -427,7 +433,7 @@ spec:
     - name: build-image
       params:
         - name: TLSVERIFY
-          value: 'false'
+          value: "false"
         - name: OUTPUT_IMAGE_STREAM
           value: $(params.APP_IMAGE_STREAM)
       runAfter:
@@ -518,7 +524,7 @@ spec:
       description: The location of the path to run s2i from
       name: PATH_CONTEXT
       type: string
-    - default: 'false'
+    - default: "false"
       description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
       name: TLSVERIFY
       type: string

diff --git a/integration-tests/cypress/testData/pipelineWithParameterTypeArray.yaml b/integration-tests/cypress/testData/pipelineWithParameterTypeArray.yaml
@@ -5,20 +5,26 @@ metadata:
 spec:
   params:
     - name: param1
-      description: ''
+      description: ""
       default:
         - foo
         - bar
     - name: param2
-      description: ''
+      description: ""
       default: default1
   resources: []
   workspaces: []
   tasks:
     - name: kn
       taskRef:
-        kind: ClusterTask
-        name: kn
+        resolver: cluster
+        params:
+          - name: kind
+            value: task
+          - name: name
+            value: kn
+          - name: namespace
+            value: openshift-pipelines
       params:
         - name: kn-image
           value: >-

diff --git a/integration-tests/cypress/testData/pipelines-workspaces/pipeline-task-tkn.yaml b/integration-tests/cypress/testData/pipelines-workspaces/pipeline-task-tkn.yaml
diff --git a/integration-tests/cypress/testData/pipelines-workspaces/pipeline-with-workspace.yaml b/integration-tests/cypress/testData/pipelines-workspaces/pipeline-with-workspace.yaml