diff --git a/src/api/index.js b/src/api/index.js index bb2a61380..cc4d77145 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -23,7 +23,6 @@ import { getKubeAPI, getQueryParams, getTektonAPI, - getTektonPipelinesAPIVersion, isLogTimestampsEnabled, useCollection, useResource @@ -282,9 +281,8 @@ export function importResources({ serviceAccount }) { const pipelineRun = deepClone(importResourcesPipelineRunTemplate); - const pipelinesAPIVersion = getTektonPipelinesAPIVersion(); - pipelineRun.apiVersion = `tekton.dev/${pipelinesAPIVersion}`; + pipelineRun.apiVersion = 'tekton.dev/v1'; pipelineRun.metadata.name = `import-resources-${Date.now()}`; pipelineRun.metadata.labels = { ...labels, @@ -298,33 +296,12 @@ export function importResources({ { name: 'target-namespace', value: namespace } ]; - if (pipelinesAPIVersion === 'v1beta1') { - pipelineRun.spec.podTemplate = { - ...pipelineRun.spec.taskRunTemplate.podTemplate - }; - delete pipelineRun.spec.taskRunTemplate.podTemplate; - } - if (serviceAccount) { - if (pipelinesAPIVersion === 'v1') { - pipelineRun.spec.taskRunTemplate.serviceAccountName = serviceAccount; - } else { - pipelineRun.spec.taskRunSpecs = [ - { - pipelineTaskName: 'fetch-repo', - taskServiceAccountName: serviceAccount - }, - { - pipelineTaskName: 'import-resources', - taskServiceAccountName: serviceAccount - } - ]; - } + pipelineRun.spec.taskRunTemplate.serviceAccountName = serviceAccount; } const uri = getTektonAPI('pipelineruns', { - namespace: importerNamespace, - version: pipelinesAPIVersion + namespace: importerNamespace }); return post(uri, pipelineRun).then(({ body }) => body); } diff --git a/src/api/pipelineRuns.js b/src/api/pipelineRuns.js index 7ae90add6..3c63c93ff 100644 --- a/src/api/pipelineRuns.js +++ b/src/api/pipelineRuns.js @@ -18,7 +18,6 @@ import { deleteRequest, get, patch, post } from './comms'; import { getQueryParams, getTektonAPI, - getTektonPipelinesAPIVersion, removeSystemLabels, useCollection, useResource @@ -95,10 +94,8 @@ export function getPipelineRunPayload({ timeoutsPipeline, timeoutsTasks }) { - const pipelinesAPIVersion = getTektonPipelinesAPIVersion(); - const payload = { - apiVersion: `tekton.dev/${pipelinesAPIVersion}`, + apiVersion: 'tekton.dev/v1', kind: 'PipelineRun', metadata: { name: pipelineRunName, @@ -130,13 +127,9 @@ export function getPipelineRunPayload({ }; } if (serviceAccount) { - if (pipelinesAPIVersion === 'v1') { - payload.spec.taskRunTemplate = { - serviceAccountName: serviceAccount - }; - } else { - payload.spec.serviceAccountName = serviceAccount; - } + payload.spec.taskRunTemplate = { + serviceAccountName: serviceAccount + }; } if (timeoutsFinally || timeoutsPipeline || timeoutsTasks) { payload.spec.timeouts = { @@ -184,8 +177,7 @@ export function generateNewPipelineRunPayload({ pipelineRun, rerun }) { pipelineRun.metadata; const payload = deepClone(pipelineRun); - payload.apiVersion = - payload.apiVersion || `tekton.dev/${getTektonPipelinesAPIVersion()}`; + payload.apiVersion = payload.apiVersion || 'tekton.dev/v1'; payload.kind = payload.kind || 'PipelineRun'; function getGenerateName() { diff --git a/src/api/taskRuns.js b/src/api/taskRuns.js index 41a5cd28b..154fdb583 100644 --- a/src/api/taskRuns.js +++ b/src/api/taskRuns.js @@ -18,7 +18,6 @@ import { deleteRequest, get, patch, post } from './comms'; import { getQueryParams, getTektonAPI, - getTektonPipelinesAPIVersion, removeSystemAnnotations, removeSystemLabels, useCollection, @@ -90,7 +89,7 @@ export function getTaskRunPayload({ timeout }) { const payload = { - apiVersion: `tekton.dev/${getTektonPipelinesAPIVersion()}`, + apiVersion: 'tekton.dev/v1', kind: 'TaskRun', metadata: { name: taskRunName, @@ -161,8 +160,7 @@ export function generateNewTaskRunPayload({ taskRun, rerun }) { taskRun.metadata; const payload = deepClone(taskRun); - payload.apiVersion = - payload.apiVersion || `tekton.dev/${getTektonPipelinesAPIVersion()}`; + payload.apiVersion = payload.apiVersion || 'tekton.dev/v1'; payload.kind = payload.kind || 'TaskRun'; function getGenerateName() { diff --git a/src/api/utils.js b/src/api/utils.js index 99ae9e136..10dadaf7b 100644 --- a/src/api/utils.js +++ b/src/api/utils.js @@ -76,18 +76,6 @@ export function getQueryParams({ return ''; } -export function isPipelinesV1ResourcesEnabled() { - return localStorage.getItem('tkn-pipelines-v1-resources') !== 'false'; -} - -export function setPipelinesV1ResourcesEnabled(enabled) { - localStorage.setItem('tkn-pipelines-v1-resources', enabled); -} - -export function getTektonPipelinesAPIVersion() { - return isPipelinesV1ResourcesEnabled() ? 'v1' : 'v1beta1'; -} - // TODO: remove this and replace usage with getKubeAPI directly export function getTektonAPI( kind, @@ -96,7 +84,7 @@ export function getTektonAPI( isWebSocket, name = '', namespace, - version = getTektonPipelinesAPIVersion() + version = 'v1' } = {}, queryParams ) { diff --git a/src/containers/Settings/Settings.jsx b/src/containers/Settings/Settings.jsx index 2b9795a2f..a02fa3a03 100644 --- a/src/containers/Settings/Settings.jsx +++ b/src/containers/Settings/Settings.jsx @@ -23,9 +23,7 @@ import { import { getTheme, setTheme } from '../../utils'; import { isLogTimestampsEnabled, - isPipelinesV1ResourcesEnabled, - setLogTimestampsEnabled, - setPipelinesV1ResourcesEnabled + setLogTimestampsEnabled } from '../../api/utils'; export function Settings() { @@ -95,24 +93,6 @@ export function Settings() { })} onToggle={checked => setLogTimestampsEnabled(checked)} /> - - setPipelinesV1ResourcesEnabled(checked)} - /> ); diff --git a/src/containers/Settings/Settings.test.jsx b/src/containers/Settings/Settings.test.jsx index 1b7c293c5..9d8aa8fd4 100644 --- a/src/containers/Settings/Settings.test.jsx +++ b/src/containers/Settings/Settings.test.jsx @@ -48,19 +48,4 @@ describe('Settings', () => { fireEvent.click(getByLabelText(/show log timestamps/i)); expect(APIUtils.setLogTimestampsEnabled).toHaveBeenCalledWith(false); }); - - it('should render the v1 API settings correctly', () => { - vi.spyOn(APIUtils, 'isPipelinesV1ResourcesEnabled').mockImplementation( - () => true - ); - vi.spyOn(APIUtils, 'setPipelinesV1ResourcesEnabled'); - - const { getByLabelText, getByText } = render(); - - const apiVersionToggle = getByText(/api version v1/i); - expect(apiVersionToggle).toBeTruthy(); - expect(within(apiVersionToggle).getByText('On')).toBeTruthy(); - fireEvent.click(getByLabelText(/api version v1/i)); - expect(APIUtils.setPipelinesV1ResourcesEnabled).toHaveBeenCalledWith(false); - }); });