diff --git a/src/hooks/useDetectNamespaces/index.tsx b/src/hooks/useDetectNamespaces/index.tsx index c0bd28747..17ac4e7dc 100644 --- a/src/hooks/useDetectNamespaces/index.tsx +++ b/src/hooks/useDetectNamespaces/index.tsx @@ -68,7 +68,6 @@ export const useDetectNamespaces = () => { Your allowed namespaces are unset. To get started, please set your namespaces by navigating to the{' '} - Allowed namespaces are unset. Navigate to { }); expect(object).toEqual({ - apiVersion: 'tekton.dev/v1beta1', + apiVersion: 'tekton.dev/v1', kind: 'PipelineRun', metadata: { namespace: 'test-namespace', @@ -74,8 +74,12 @@ describe('testing createBuildPipelineRunInstance', () => { pipelineRef: { name: 'test-git-provider-test-build-tool-test-framework-app-build-test-versioning-type', }, - serviceAccountName: 'tekton', - timeout: '1h0m0s', + taskRunTemplate: { + serviceAccountName: 'tekton', + }, + timeouts: { + pipeline: '1h0m0s', + }, workspaces: [ { name: 'settings', diff --git a/src/k8s/PipelineRun/utils/createBuildPipelineRunInstance/index.ts b/src/k8s/PipelineRun/utils/createBuildPipelineRunInstance/index.ts index 5a9c497a8..2f47e1650 100644 --- a/src/k8s/PipelineRun/utils/createBuildPipelineRunInstance/index.ts +++ b/src/k8s/PipelineRun/utils/createBuildPipelineRunInstance/index.ts @@ -82,8 +82,12 @@ export const createBuildPipelineRunInstance = ({ pipelineRef: { name: `${gitProvider}-${codebaseBuildTool}-${codebaseFramework}-${truncatedCodebaseType}-build-${codebaseVersioningType}`, }, - serviceAccountName: 'tekton', - timeout: '1h0m0s', + taskRunTemplate: { + serviceAccountName: 'tekton', + }, + timeouts: { + pipeline: '1h0m0s', + }, workspaces: [ { name: 'settings', diff --git a/src/k8s/PipelineRun/utils/createDeployPipelineRunInstance/index.test.ts b/src/k8s/PipelineRun/utils/createDeployPipelineRunInstance/index.test.ts index 11a74d2f4..397b79a94 100644 --- a/src/k8s/PipelineRun/utils/createDeployPipelineRunInstance/index.test.ts +++ b/src/k8s/PipelineRun/utils/createDeployPipelineRunInstance/index.test.ts @@ -27,7 +27,7 @@ describe('testing createDeployPipelineRunInstance', () => { }); expect(object).toEqual({ - apiVersion: 'tekton.dev/v1beta1', + apiVersion: 'tekton.dev/v1', kind: 'PipelineRun', metadata: { namespace: 'test-namespace', diff --git a/src/k8s/TaskRun/config.ts b/src/k8s/TaskRun/config.ts index ad070f27a..3f1809bda 100644 --- a/src/k8s/TaskRun/config.ts +++ b/src/k8s/TaskRun/config.ts @@ -7,5 +7,5 @@ export const TaskRunKubeObjectConfig: KubeObjectConfig = { pluralForm: 'taskruns', }, group: 'tekton.dev', - version: 'v1beta1', + version: 'v1', };