From f9c56247d6c424a5639dde16753d9e29bbafaa1e Mon Sep 17 00:00:00 2001 From: Harsh Tamakuwala Date: Wed, 20 Nov 2024 19:40:16 +0530 Subject: [PATCH 1/3] [patch] Adds db2_namespace parameter in pipeline --- tekton/src/params/install.yml.j2 | 4 ++++ tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 | 3 +++ tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 | 3 +++ 3 files changed, 10 insertions(+) diff --git a/tekton/src/params/install.yml.j2 b/tekton/src/params/install.yml.j2 index b01b6836d5..b01d391b24 100644 --- a/tekton/src/params/install.yml.j2 +++ b/tekton/src/params/install.yml.j2 @@ -205,6 +205,10 @@ type: string description: Set to 'system' if using the shared system JDBC configuration, or 'workspace-application' if using a dedicated JDBC configuration. default: "" +- name: db2_namespace + type: string + description: Set custom namespace for db2. Default: db2u + default: "db2u" # Dependencies - CP4D # ----------------------------------------------------------------------------- diff --git a/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 b/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 index a249e85b21..0ae9c8d440 100644 --- a/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/db2-setup-manage.yml.j2 @@ -7,6 +7,9 @@ - name: db2_instance_name value: "mas-$(params.mas_instance_id)-$(params.mas_workspace_id)-manage" + + - name: db2_namespace + value: "$(params.db2_namespace)" # Only perform the hack if Manage is being installed, if we're using in-cluster system db and we're not using a dedicated Db2 instance for Manage (in-cluster or BYO) when: - input: "$(params.mas_app_channel_manage)" diff --git a/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 b/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 index da5afcc420..f9d4cc411f 100644 --- a/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 +++ b/tekton/src/pipelines/taskdefs/apps/db2-setup-system.yml.j2 @@ -7,6 +7,9 @@ - name: db2_instance_name value: "mas-$(params.mas_instance_id)-system" + + - name: db2_namespace + value: "$(params.db2_namespace)" # Only perform the hack if Manage is being installed, if we're using in-cluster system db and we're not using a dedicated Db2 instance for Manage (in-cluster or BYO) when: - input: "$(params.mas_app_channel_manage)" From 547240f66efcf68773e6ca067cd6cd0af8774b7d Mon Sep 17 00:00:00 2001 From: Harsh Tamakuwala Date: Thu, 21 Nov 2024 13:39:48 +0530 Subject: [PATCH 2/3] [patch] fixes indentation error --- tekton/src/params/install.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekton/src/params/install.yml.j2 b/tekton/src/params/install.yml.j2 index b01d391b24..8328548525 100644 --- a/tekton/src/params/install.yml.j2 +++ b/tekton/src/params/install.yml.j2 @@ -207,7 +207,7 @@ default: "" - name: db2_namespace type: string - description: Set custom namespace for db2. Default: db2u + description: Set custom namespace for db2. Default is 'db2u'. default: "db2u" # Dependencies - CP4D From bb3c16abf69b3164e88e0317044cff11a3e2e682 Mon Sep 17 00:00:00 2001 From: Harsh Tamakuwala Date: Thu, 21 Nov 2024 13:58:01 +0530 Subject: [PATCH 3/3] [patch] Fixes duplicate parameter error --- tekton/src/params/install.yml.j2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tekton/src/params/install.yml.j2 b/tekton/src/params/install.yml.j2 index 8328548525..b01b6836d5 100644 --- a/tekton/src/params/install.yml.j2 +++ b/tekton/src/params/install.yml.j2 @@ -205,10 +205,6 @@ type: string description: Set to 'system' if using the shared system JDBC configuration, or 'workspace-application' if using a dedicated JDBC configuration. default: "" -- name: db2_namespace - type: string - description: Set custom namespace for db2. Default is 'db2u'. - default: "db2u" # Dependencies - CP4D # -----------------------------------------------------------------------------