From 37ac47f8b5ceb00b929b545717a9225c2082d170 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Tue, 25 Nov 2025 14:27:39 +0530 Subject: [PATCH 1/8] [patch] Remove aiservice-install pipelinerun and Enable Aiservice install in mas-install --- src/mas/devops/tekton.py | 23 +- .../pipelinerun-aiservice-install.yml.j2 | 296 ------------------ .../templates/pipelinerun-install.yml.j2 | 129 +++++++- 3 files changed, 127 insertions(+), 321 deletions(-) delete mode 100644 src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index f489d5b5..bea9a612 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -429,15 +429,17 @@ def launchPipelineRun(dynClient: DynamicClient, namespace: str, templateName: st return timestamp -def launchInstallPipeline(dynClient: DynamicClient, params: dict) -> str: +def launchInstallPipeline(dynClient: DynamicClient, params: dict, standalone_aiservice_install: str = "false") -> str: """ - Create a PipelineRun to install the chosen MAS instance (and selected dependencies) + Create a PipelineRun to install the chosen MAS ( or AI Service ) instance (and selected dependencies) """ - instanceId = params["mas_instance_id"] - namespace = f"mas-{instanceId}-pipelines" + applicationType = "aiservice" if standalone_aiservice_install == "true" else "mas" + params["applicationType"] = applicationType + instanceId = params[f"{applicationType}_instance_id"] + namespace = f"{applicationType}-{instanceId}-pipelines" timestamp = launchPipelineRun(dynClient, namespace, "pipelinerun-install", params) - pipelineURL = f"{getConsoleURL(dynClient)}/k8s/ns/mas-{instanceId}-pipelines/tekton.dev~v1beta1~PipelineRun/{instanceId}-install-{timestamp}" + pipelineURL = f"{getConsoleURL(dynClient)}/k8s/ns/{applicationType}-{instanceId}-pipelines/tekton.dev~v1beta1~PipelineRun/{instanceId}-install-{timestamp}" return pipelineURL @@ -452,17 +454,6 @@ def launchUpdatePipeline(dynClient: DynamicClient, params: dict) -> str: return pipelineURL -def launchAiServiceInstallPipeline(dynClient: DynamicClient, params: dict) -> str: - """ - Create a PipelineRun to install the AI Service - """ - instanceId = params["aiservice_instance_id"] - namespace = f"aiservice-{instanceId}-pipelines" - timestamp = launchPipelineRun(dynClient, namespace, "pipelinerun-aiservice-install", params) - - pipelineURL = f"{getConsoleURL(dynClient)}/k8s/ns/aiservice-{instanceId}-pipelines/tekton.dev~v1beta1~PipelineRun/{instanceId}-install-{timestamp}" - return pipelineURL - def launchAiServiceUpgradePipeline(dynClient: DynamicClient, aiserviceInstanceId: str, diff --git a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 deleted file mode 100644 index 9e12a7a1..00000000 --- a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 +++ /dev/null @@ -1,296 +0,0 @@ ---- -apiVersion: tekton.dev/v1beta1 -kind: PipelineRun -metadata: - name: "{{aiservice_instance_id}}-install-{{ timestamp }}" - labels: - tekton.dev/pipeline: aiservice-install -spec: - pipelineRef: - name: aiservice-install - - serviceAccountName: "{{ service_account_name | default('pipeline', True) }}" - timeouts: - pipeline: "0" - - params: - # IBM Entitlement Key - # ------------------------------------------------------------------------- - - name: ibm_entitlement_key - value: "{{ ibm_entitlement_key }}" -{%- if skip_pre_check is defined and skip_pre_check != "" %} - - # Pipeline config - # ------------------------------------------------------------------------- - - name: skip_pre_check - value: "{{ skip_pre_check }}" -{%- endif %} -{%- if image_pull_policy is defined and image_pull_policy != "" %} - - # Image Pull Policy - # ------------------------------------------------------------------------- - - name: image_pull_policy - value: "{{ image_pull_policy }}" -{%- endif %} -{%- if ocp_ingress_tls_secret_name is defined and ocp_ingress_tls_secret_name != "" %} - - # Cluster config - # ------------------------------------------------------------------------- - - name: ocp_ingress_tls_secret_name - value: "{{ ocp_ingress_tls_secret_name }}" -{%- endif %} -{%- if artifactory_username is defined and artifactory_username != "" %} - - # Enable development catalogs - # ------------------------------------------------------------------------- - - name: artifactory_username - value: "{{ artifactory_username }}" - - name: artifactory_token - value: "{{ artifactory_token }}" -{%- endif %} -{%- if ibmcloud_apikey is defined and ibmcloud_resourcegroup != "" %} - - # IBM Cloud - # ------------------------------------------------------------------------- - - name: ibmcloud_apikey - value: "{{ ibmcloud_apikey }}" - - name: ibmcloud_resourcegroup - value: "{{ ibmcloud_resourcegroup }}" -{%- endif %} - - # Storage Classes - # ------------------------------------------------------------------------- - - name: storage_class_rwx - value: "{{ storage_class_rwx }}" - - name: storage_class_rwo - value: "{{ storage_class_rwo }}" - - # MAS Catalog - # ------------------------------------------------------------------------- - - name: mas_catalog_version - value: "{{ mas_catalog_version }}" -{%- if mas_catalog_digest is defined and mas_catalog_digest != "" %} - - name: mas_catalog_digest - value: "{{ mas_catalog_digest }}" -{%- endif %} - -{%- if mongodb_action is defined and mongodb_action != "" %} - - # Dependencies - MongoDb - # ------------------------------------------------------------------------- - - name: mongodb_action - value: "{{ mongodb_action }}" - - name: mongodb_namespace - value: "{{ mongodb_namespace }}" - - name: mongodb_replicas - value: "{{ mongodb_replicas }}" - - name: mongodb_cpu_requests - value: "{{ mongodb_cpu_requests }}" - - name: mongodb_provider - value: "{{ mongodb_provider }}" - - name: mongodb_version - value: "{{ mongodb_version }}" - {%- if mongodb_provider == "ibm" %} - - # Dependencies - IBM Cloud MongoDb - # ------------------------------------------------------------------------- - - name: ibm_mongo_name - value: "{{ ibm_mongo_name }}" - - name: ibm_mongo_resourcegroup - value: "{{ ibm_mongo_resourcegroup }}" - - name: ibm_mongo_region - value: "{{ ibm_mongo_region }}" - - name: ibm_mongo_admin_password - value: "{{ ibm_mongo_admin_password }}" - {%- endif %} -{%- endif %} - - # Dependencies - SLS - # ------------------------------------------------------------------------- - - name: sls_channel - value: '3.x' -{%- if sls_entitlement_file is defined and sls_entitlement_file != "" %} - - name: sls_entitlement_file - value: "{{ sls_entitlement_file }}" -{%- endif %} -{%- if sls_namespace is defined and sls_namespace != "" %} - - name: sls_namespace - value: "{{ sls_namespace }}" -{%- endif %} -{%- if sls_icr_cpopen is defined and sls_icr_cpopen != "" %} - - name: sls_icr_cpopen - value: "{{ sls_icr_cpopen }}" -{%- endif %} -{%- if sls_mongodb_cfg_file is defined and sls_mongodb_cfg_file != "" %} - - name: sls_mongodb_cfg_file - value: "{{ sls_mongodb_cfg_file }}" -{%- endif %} -{%- if sls_action is defined and sls_action != "" %} - - name: sls_action - value: "{{ sls_action }}" -{%- endif %} -{%- if aiservice_sls_url is defined and aiservice_sls_url != "" %} - - # Remote SLS - # ------------------------------------------------------------------------- - - name: aiservice_sls_secret_name - value: "{{ aiservice_sls_secret_name }}" - - name: aiservice_sls_registration_key - value: "{{ aiservice_sls_registration_key }}" - - name: aiservice_sls_url - value: "{{ aiservice_sls_url }}" - - name: aiservice_sls_ca_cert - value: "{{ aiservice_sls_ca_cert }}" -{%- endif %} - - # Dependencies - UDS/DRO (Required) - # ------------------------------------------------------------------------- - - name: uds_action - value: "{{ uds_action }}" - - name: uds_contact_email - value: "{{ uds_contact_email }}" - - name: uds_contact_firstname - value: "{{ uds_contact_firstname }}" - - name: uds_contact_lastname - value: "{{ uds_contact_lastname }}" -{%- if dro_namespace is defined and dro_namespace != "" %} - - name: dro_namespace - value: "{{ dro_namespace }}" -{%- endif %} - - # Dependencies - Certificate Manager - # ------------------------------------------------------------------------- - - name: cert_manager_provider - value: "{{ cert_manager_provider }}" - - name: cert_manager_action - value: "{{ cert_manager_action }}" - - # Dependencies - Db2 - # ------------------------------------------------------------------------- - - name: db2_action_aiservice - value: "{{ db2_action_aiservice }}" - - # AI Service - # ------------------------------------------------------------------------- - - name: aiservice_instance_id - value: "{{ aiservice_instance_id }}" - - name: aiservice_channel - value: "{{ aiservice_channel }}" - - - name: environment_type - value: "{{ environment_type }}" - - - name: mas_icr_cp - value: "{{ mas_icr_cp }}" - - name: mas_icr_cpopen - value: "{{ mas_icr_cpopen }}" - - # AI Service Tenant - # ------------------------------------------------------------------------- - - name: tenant_entitlement_type - value: "{{ tenant_entitlement_type }}" - - name: tenant_entitlement_start_date - value: "{{ tenant_entitlement_start_date }}" - - name: tenant_entitlement_end_date - value: "{{ tenant_entitlement_end_date }}" - - # RSL - # ------------------------------------------------------------------------- - - name: rsl_url - value: "{{ rsl_url }}" - - name: rsl_org_id - value: "{{ rsl_org_id }}" - - name: rsl_token - value: "{{ rsl_token }}" - - # S3 - # ------------------------------------------------------------------------- - - name: aiservice_s3_accesskey - value: "{{ aiservice_s3_accesskey }}" - - name: aiservice_s3_secretkey - value: "{{ aiservice_s3_secretkey }}" - - name: aiservice_s3_host - value: "{{ aiservice_s3_host }}" - - name: aiservice_s3_port - value: "{{ aiservice_s3_port }}" - - name: aiservice_s3_ssl - value: "{{ aiservice_s3_ssl }}" - - name: aiservice_s3_region - value: "{{ aiservice_s3_region }}" - - name: aiservice_s3_bucket_prefix - value: "{{ aiservice_s3_bucket_prefix }}" - - - name: aiservice_s3_tenants_bucket - value: "{{ aiservice_s3_tenants_bucket }}" - - name: aiservice_s3_templates_bucket - value: "{{ aiservice_s3_templates_bucket }}" - - - name: minio_root_user - value: "{{ minio_root_user }}" - - name: minio_root_password - value: "{{ minio_root_password }}" - - # AI Service - ODH - # ------------------------------------------------------------------------- - - name: aiservice_odh_model_deployment_type - value: "{{ aiservice_odh_model_deployment_type }}" - - # AI Service - watsonX - # ------------------------------------------------------------------------- - - name: aiservice_watsonxai_apikey - value: "{{ aiservice_watsonxai_apikey }}" - - name: aiservice_watsonxai_url - value: "{{ aiservice_watsonxai_url }}" - - name: aiservice_watsonxai_project_id - value: "{{ aiservice_watsonxai_project_id }}" - - name: aiservice_watsonx_action - value: "{{ aiservice_watsonx_action }}" - - name: aiservice_watsonxai_ca_crt - value: "{{ aiservice_watsonxai_ca_crt }}" - - name: aiservice_watsonxai_instance_id - value: "{{ aiservice_watsonxai_instance_id }}" - - name: aiservice_watsonxai_username - value: "{{ aiservice_watsonxai_username }}" - - name: aiservice_watsonxai_version - value: "{{ aiservice_watsonxai_version }}" - - name: aiservice_watsonxai_deployment_id - value: "{{ aiservice_watsonxai_deployment_id }}" - - name: aiservice_watsonxai_space_id - value: "{{ aiservice_watsonxai_space_id }}" - - name: aiservice_watsonxai_full - value: "{{ aiservice_watsonxai_full }}" - - workspaces: - # The generated configuration files - # ------------------------------------------------------------------------- - - name: shared-configs - persistentVolumeClaim: - claimName: config-pvc - - # User-provided configurations - # ------------------------------------------------------------------------- - # Any pre-generated configs that will be copied into the - # shared-config during install-suite - - name: shared-additional-configs - secret: - secretName: pipeline-additional-configs - - # SLS entitlement - # ------------------------------------------------------------------------- - # The SLS entitlement key file that will be installed - # during install-sls - - name: shared-entitlement - secret: - secretName: pipeline-sls-entitlement - - # PodTemplates configurations - # ------------------------------------------------------------------------- - - name: shared-pod-templates - secret: - secretName: pipeline-pod-templates - - # Certificates configurations - # ------------------------------------------------------------------------- - - name: shared-certificates - secret: - secretName: pipeline-certificates diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 38092b27..165777e4 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -2,7 +2,11 @@ apiVersion: tekton.dev/v1beta1 kind: PipelineRun metadata: +{%- if applicationType is defined and applicationType == "mas" %} name: "{{mas_instance_id}}-install-{{ timestamp }}" +{%- else %} + name: "{{aiservice_instance_id}}-install-{{ timestamp }}" +{%- endif %} labels: tekton.dev/pipeline: mas-install spec: @@ -312,18 +316,31 @@ spec: - name: sls_action value: "{{ sls_action }}" {%- endif %} +{%- if aiservice_sls_url is defined and aiservice_sls_url != "" %} + # Remote SLS + # ------------------------------------------------------------------------- + - name: aiservice_sls_secret_name + value: "{{ aiservice_sls_secret_name }}" + - name: aiservice_sls_registration_key + value: "{{ aiservice_sls_registration_key }}" + - name: aiservice_sls_url + value: "{{ aiservice_sls_url }}" + - name: aiservice_sls_ca_cert + value: "{{ aiservice_sls_ca_cert }}" +{%- endif %} - # Dependencies - UDS/DRO (Required) + + # Dependencies - DRO (Required) # ------------------------------------------------------------------------- - - name: uds_action - value: "{{ uds_action }}" - - name: uds_contact_email - value: "{{ uds_contact_email }}" - - name: uds_contact_firstname - value: "{{ uds_contact_firstname }}" - - name: uds_contact_lastname - value: "{{ uds_contact_lastname }}" + - name: dro_action + value: "{{ dro_action }}" + - name: dro_contact_email + value: "{{ dro_contact_email }}" + - name: dro_contact_firstname + value: "{{ dro_contact_firstname }}" + - name: dro_contact_lastname + value: "{{ dro_contact_lastname }}" {%- if dro_namespace is defined and dro_namespace != "" %} - name: dro_namespace value: "{{ dro_namespace }}" @@ -777,6 +794,100 @@ spec: value: "{{ mas_ws_facilities_config_map_name }}" {%- endif %} +{%- endif %} + +{%- if aiservice_instance_id is defined and aiservice_instance_id != "" %} + + # AI Service + # ------------------------------------------------------------------------- + {%- if standalone_aiservice_install is defined and standalone_aiservice_install != "" %} + - name: standalone_aiservice_install + value: "{{ standalone_aiservice_install }}" + {%- endif %} + - name: aiservice_instance_id + value: "{{ aiservice_instance_id }}" + - name: aiservice_channel + value: "{{ aiservice_channel }}" + - name: db2_action_aiservice + value: "{{ db2_action_aiservice }}" + + - name: environment_type + value: "{{ environment_type }}" + + # AI Service Tenant + # ------------------------------------------------------------------------- + - name: tenant_entitlement_type + value: "{{ tenant_entitlement_type }}" + - name: tenant_entitlement_start_date + value: "{{ tenant_entitlement_start_date }}" + - name: tenant_entitlement_end_date + value: "{{ tenant_entitlement_end_date }}" + + # RSL + # ------------------------------------------------------------------------- + - name: rsl_url + value: "{{ rsl_url }}" + - name: rsl_org_id + value: "{{ rsl_org_id }}" + - name: rsl_token + value: "{{ rsl_token }}" + + # S3 + # ------------------------------------------------------------------------- + - name: aiservice_s3_accesskey + value: "{{ aiservice_s3_accesskey }}" + - name: aiservice_s3_secretkey + value: "{{ aiservice_s3_secretkey }}" + - name: aiservice_s3_host + value: "{{ aiservice_s3_host }}" + - name: aiservice_s3_port + value: "{{ aiservice_s3_port }}" + - name: aiservice_s3_ssl + value: "{{ aiservice_s3_ssl }}" + - name: aiservice_s3_region + value: "{{ aiservice_s3_region }}" + - name: aiservice_s3_bucket_prefix + value: "{{ aiservice_s3_bucket_prefix }}" + + - name: aiservice_s3_tenants_bucket + value: "{{ aiservice_s3_tenants_bucket }}" + - name: aiservice_s3_templates_bucket + value: "{{ aiservice_s3_templates_bucket }}" + + - name: minio_root_user + value: "{{ minio_root_user }}" + - name: minio_root_password + value: "{{ minio_root_password }}" + + # AI Service - ODH + # ------------------------------------------------------------------------- + - name: aiservice_odh_model_deployment_type + value: "{{ aiservice_odh_model_deployment_type }}" + + # AI Service - watsonX + # ------------------------------------------------------------------------- + - name: aiservice_watsonxai_apikey + value: "{{ aiservice_watsonxai_apikey }}" + - name: aiservice_watsonxai_url + value: "{{ aiservice_watsonxai_url }}" + - name: aiservice_watsonxai_project_id + value: "{{ aiservice_watsonxai_project_id }}" + - name: aiservice_watsonx_action + value: "{{ aiservice_watsonx_action }}" + - name: aiservice_watsonxai_ca_crt + value: "{{ aiservice_watsonxai_ca_crt }}" + - name: aiservice_watsonxai_instance_id + value: "{{ aiservice_watsonxai_instance_id }}" + - name: aiservice_watsonxai_username + value: "{{ aiservice_watsonxai_username }}" + - name: aiservice_watsonxai_version + value: "{{ aiservice_watsonxai_version }}" + - name: aiservice_watsonxai_deployment_id + value: "{{ aiservice_watsonxai_deployment_id }}" + - name: aiservice_watsonxai_space_id + value: "{{ aiservice_watsonxai_space_id }}" + - name: aiservice_watsonxai_full + value: "{{ aiservice_watsonxai_full }}" {%- endif %} workspaces: From 40e999cb8dd99956eb6ef9cd6d9a9af77873b14a Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Tue, 25 Nov 2025 14:35:06 +0530 Subject: [PATCH 2/8] [patch] Fix pre-commit issue --- src/mas/devops/tekton.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 838be456..c5e295c3 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -449,7 +449,6 @@ def launchUpdatePipeline(dynClient: DynamicClient, params: dict) -> str: return pipelineURL - def launchAiServiceUpgradePipeline(dynClient: DynamicClient, aiserviceInstanceId: str, skipPreCheck: bool = False, From 97d91fef29a732e775618218c5594fd1f087b454 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Tue, 25 Nov 2025 14:41:58 +0530 Subject: [PATCH 3/8] [patch] Re trigger build From 751f8317ae970235feddf5e35f62fa4f9546923b Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Tue, 25 Nov 2025 16:58:08 +0530 Subject: [PATCH 4/8] [patch] Re-trigger build From a04378546b54d4d0684348fdb8380b896fc2bb82 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Tue, 25 Nov 2025 17:19:33 +0530 Subject: [PATCH 5/8] [patch] Re-trigger Build From c6354eced26c0dc559aa0a4fa912658a176bfd9a Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Mon, 1 Dec 2025 11:22:20 +0530 Subject: [PATCH 6/8] [patch] Add watsonx_on_prem --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index c8f546a3..330a61dd 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -886,8 +886,8 @@ spec: value: "{{ aiservice_watsonxai_deployment_id }}" - name: aiservice_watsonxai_space_id value: "{{ aiservice_watsonxai_space_id }}" - - name: aiservice_watsonxai_full - value: "{{ aiservice_watsonxai_full }}" + - name: aiservice_watsonxai_on_prem + value: "{{ aiservice_watsonxai_on_prem }}" {%- endif %} workspaces: From e9be3745003539bd906cfb8771caea46df238241 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Fri, 12 Dec 2025 11:07:23 +0530 Subject: [PATCH 7/8] [patch] Remove standalone_aiservice_install flag --- src/mas/devops/tekton.py | 4 ++-- src/mas/devops/templates/pipelinerun-install.yml.j2 | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py index 090923d3..6c169ce2 100644 --- a/src/mas/devops/tekton.py +++ b/src/mas/devops/tekton.py @@ -475,11 +475,11 @@ def launchPipelineRun(dynClient: DynamicClient, namespace: str, templateName: st return timestamp -def launchInstallPipeline(dynClient: DynamicClient, params: dict, standalone_aiservice_install: str = "false") -> str: +def launchInstallPipeline(dynClient: DynamicClient, params: dict) -> str: """ Create a PipelineRun to install the chosen MAS ( or AI Service ) instance (and selected dependencies) """ - applicationType = "aiservice" if standalone_aiservice_install == "true" else "mas" + applicationType = "aiservice" if not params.get("mas_instance_id") else "mas" params["applicationType"] = applicationType instanceId = params[f"{applicationType}_instance_id"] namespace = f"{applicationType}-{instanceId}-pipelines" diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 330a61dd..ceff14f4 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -800,10 +800,6 @@ spec: # AI Service # ------------------------------------------------------------------------- - {%- if standalone_aiservice_install is defined and standalone_aiservice_install != "" %} - - name: standalone_aiservice_install - value: "{{ standalone_aiservice_install }}" - {%- endif %} - name: aiservice_instance_id value: "{{ aiservice_instance_id }}" - name: aiservice_channel From ae25b9e579182de8fd1a1348eadb998e67ead748 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Fri, 12 Dec 2025 19:26:58 +0530 Subject: [PATCH 8/8] [patch] Refactor mas-install PipelineRun Template --- .../devops/templates/pipelinerun-install.yml.j2 | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index ceff14f4..df875d45 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1 kind: PipelineRun metadata: -{%- if applicationType is defined and applicationType == "mas" %} +{%- if mas_instance_id is defined and mas_instance_id != "" %} name: "{{mas_instance_id}}-install-{{ timestamp }}" {%- else %} name: "{{aiservice_instance_id}}-install-{{ timestamp }}" @@ -312,20 +312,6 @@ spec: - name: sls_action value: "{{ sls_action }}" {%- endif %} -{%- if aiservice_sls_url is defined and aiservice_sls_url != "" %} - - # Remote SLS - # ------------------------------------------------------------------------- - - name: aiservice_sls_secret_name - value: "{{ aiservice_sls_secret_name }}" - - name: aiservice_sls_registration_key - value: "{{ aiservice_sls_registration_key }}" - - name: aiservice_sls_url - value: "{{ aiservice_sls_url }}" - - name: aiservice_sls_ca_cert - value: "{{ aiservice_sls_ca_cert }}" -{%- endif %} - # Dependencies - DRO (Required) # -------------------------------------------------------------------------