Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/mas/devops/tekton.py
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ def launchUpgradePipeline(
pipelineRun = yaml.safe_load(renderedTemplate)
applyResource(
dynClient=dynClient,
apiVersion="tekton.dev/v1beta1",
apiVersion="tekton.dev/v1",
kind="PipelineRun",
body=pipelineRun,
namespace=namespace,
Expand Down Expand Up @@ -1148,7 +1148,7 @@ def launchUninstallPipeline(
pipelineRun = yaml.safe_load(renderedTemplate)
applyResource(
dynClient=dynClient,
apiVersion="tekton.dev/v1beta1",
apiVersion="tekton.dev/v1",
kind="PipelineRun",
body=pipelineRun,
namespace=namespace,
Expand Down Expand Up @@ -1188,7 +1188,7 @@ def launchPipelineRun(dynClient: DynamicClient, namespace: str, templateName: st
pipelineRun = yaml.safe_load(renderedTemplate)
applyResource(
dynClient=dynClient,
apiVersion="tekton.dev/v1beta1",
apiVersion="tekton.dev/v1",
kind="PipelineRun",
body=pipelineRun,
namespace=namespace,
Expand Down Expand Up @@ -1319,7 +1319,7 @@ def launchAiServiceUpgradePipeline(
pipelineRun = yaml.safe_load(renderedTemplate)
applyResource(
dynClient=dynClient,
apiVersion="tekton.dev/v1beta1",
apiVersion="tekton.dev/v1",
kind="PipelineRun",
body=pipelineRun,
namespace=namespace,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: "{{ aiservice_instance_id }}-upgrade-{{ timestamp }}"
Expand All @@ -9,7 +9,8 @@ spec:
pipelineRef:
name: aiservice-upgrade

serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"

Expand Down
5 changes: 3 additions & 2 deletions src/mas/devops/templates/pipelinerun-backup.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: "{{ mas_instance_id }}-backup-{{ backup_version }}-{{ timestamp }}"
Expand All @@ -8,7 +8,8 @@ metadata:
spec:
pipelineRef:
name: mas-backup
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"
workspaces:
Expand Down
7 changes: 4 additions & 3 deletions src/mas/devops/templates/pipelinerun-install.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
{%- if mas_instance_id is defined and mas_instance_id != "" %}
Expand All @@ -13,7 +13,8 @@ spec:
pipelineRef:
name: mas-install

serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"

Expand Down Expand Up @@ -116,7 +117,7 @@ spec:
value: "{{ db2_type }}"
- name: db2_timezone
value: "{{ db2_timezone }}"
{%- if db2_action_facilities == "install" %}
{%- if db2_action_facilities == "install" %}
- name: db2_facilities_timezone
value: "{{ db2_facilities_timezone }}"
{%- endif %}
Expand Down
5 changes: 3 additions & 2 deletions src/mas/devops/templates/pipelinerun-restore.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: "{{ mas_instance_id }}-restore-{{ restore_version }}-{{ timestamp }}"
Expand All @@ -8,7 +8,8 @@ metadata:
spec:
pipelineRef:
name: mas-restore
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"
workspaces:
Expand Down
5 changes: 3 additions & 2 deletions src/mas/devops/templates/pipelinerun-uninstall.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: "{{mas_instance_id}}-uninstall-{{ timestamp }}"
Expand All @@ -9,7 +9,8 @@ spec:
pipelineRef:
name: mas-uninstall

serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"

Expand Down
5 changes: 3 additions & 2 deletions src/mas/devops/templates/pipelinerun-update.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: "mas-update-{{ timestamp }}"
Expand All @@ -9,7 +9,8 @@ spec:
pipelineRef:
name: mas-update

serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"

Expand Down
5 changes: 3 additions & 2 deletions src/mas/devops/templates/pipelinerun-upgrade.yml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: "{{ mas_instance_id }}-upgrade-{{ timestamp }}"
Expand All @@ -9,7 +9,8 @@ spec:
pipelineRef:
name: mas-upgrade

serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
taskRunTemplate:
serviceAccountName: "{{ service_account_name | default('pipeline', True) }}"
timeouts:
pipeline: "0"

Expand Down
14 changes: 7 additions & 7 deletions test/src/test_tekton_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ def test_update_tekton_definitions_success(self, mock_yaml_load, mock_file, mock
mock_isfile.return_value = True
mock_yaml_load.return_value = [
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Task",
"metadata": {"name": "test-task"},
"spec": {},
},
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Pipeline",
"metadata": {"name": "test-pipeline"},
"spec": {},
Expand Down Expand Up @@ -101,19 +101,19 @@ def test_update_tekton_definitions_multiple_resources(self, mock_yaml_load, mock
mock_isfile.return_value = True
mock_yaml_load.return_value = [
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Task",
"metadata": {"name": "task-1"},
"spec": {},
},
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Task",
"metadata": {"name": "task-2"},
"spec": {},
},
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Pipeline",
"metadata": {"name": "pipeline-1"},
"spec": {},
Expand Down Expand Up @@ -145,7 +145,7 @@ def test_update_tekton_definitions_retry_on_transient_error(self, mock_sleep, mo
mock_isfile.return_value = True
mock_yaml_load.return_value = [
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Task",
"metadata": {"name": "test-task"},
"spec": {},
Expand Down Expand Up @@ -183,7 +183,7 @@ def test_update_tekton_definitions_api_exception(self, mock_yaml_load, mock_file
mock_isfile.return_value = True
mock_yaml_load.return_value = [
{
"apiVersion": "tekton.dev/v1beta1",
"apiVersion": "tekton.dev/v1",
"kind": "Task",
"metadata": {"name": "test-task"},
"spec": {},
Expand Down
Loading