From acd39913152e1386f2cfca782a314c2614ab4ba8 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 12 Aug 2024 12:26:46 +0100 Subject: [PATCH 1/7] [patch] add aibroker variables --- .../templates/pipelinerun-install.yml.j2 | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 352ab6c6..618f9101 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -713,3 +713,86 @@ spec: - name: shared-certificates secret: secretName: pipeline-certificates + +{%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider!= "" %} + # AI Broker - opendata hub storage dependencies + # ------------------------------------------------------------------------- + - name: mas_aibroker_storage_provider + value: "{{ mas_aibroker_storage_provider }}" + - name: mas_aibroker_storage_accesskey + value: "{{ mas_aibroker_storage_accesskey }}" + - name: mas_aibroker_storage_secretkey + value: "{{ mas_aibroker_storage_secretkey }}" + - name: mas_aibroker_storage_host + value: "{{ mas_aibroker_storage_host }}" + - name: mas_aibroker_storage_port + value: "{{ mas_aibroker_storage_port }}" + - name: mas_aibroker_storage_ssl + value: "{{ mas_aibroker_storage_ssl }}" + - name: mas_aibroker_storage_region + value: "{{ mas_aibroker_storage_region }}" + - name: mas_aibroker_storage_piplines_bucket + value: "{{ mas_aibroker_storage_piplines_bucket }}" + - name: mas_aibroker_storage_tenants_bucket + value: "{{ mas_aibroker_storage_tenants_bucket }}" + - name: mas_aibroker_storage_templates_bucket + value: "{{ mas_aibroker_storage_templates_bucket }}" + - name: mas_aibroker_tenant_name + value: "{{ mas_aibroker_tenant_name }}" +{%- endif %} + +{%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag!= "" %} + # AI Broker - kmodels apps tags dependencies + # ------------------------------------------------------------------------- + - name: mas_aibroker_controller_tag + value: "{{ mas_aibroker_controller_tag }}" + - name: mas_aibroker_store_tag + value: "{{ mas_aibroker_store_tag }}" + - name: mas_aibroker_watcher_tag + value: "{{ mas_aibroker_watcher_tag }}" + - name: mas_aibroker_connector_tag + value: "{{ mas_aibroker_connector_tag }}" + - name: mas_aibroker_pipeline_steps_tag + value: "{{ mas_aibroker_pipeline_steps_tag }}" +{%- endif %} + +{%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey!= "" %} + # AI Broker - aibroker app watsonX dependencies + # ------------------------------------------------------------------------- + - name: mas_aibroker_watsonxai_apikey + value: "{{ mas_aibroker_watsonxai_apikey }}" + - name: mas_aibroker_watsonxai_url + value: "{{ mas_aibroker_watsonxai_url }}" + - name: mas_aibroker_watsonxai_project_id + value: "{{ mas_aibroker_watsonxai_project_id }}" + - name: mas_aibroker_watsonx_action + value: "{{ mas_aibroker_watsonx_action }}" +{%- endif %} + +{%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action!= "" %} + # AI Broker - aibroker app secret create actions + # ------------------------------------------------------------------------- + - name: mas_aibroker_s3_action + value: "{{ mas_aibroker_s3_action }}" + - name: mas_aibroker_apikey_action + value: "{{ mas_aibroker_apikey_action }}" +{%- endif %} + +{%- if mas_aibroker_db_host is defined and mas_aibroker_db_host!= "" %} + # AI Broker - mariaDB details for DataSciencePipelinesApplication dependencies + # ------------------------------------------------------------------------- + - name: mas_aibroker_db_host + value: "{{ mas_aibroker_db_host }}" + - name: mas_aibroker_db_port + value: "{{ mas_aibroker_db_port }}" + - name: mas_aibroker_db_user + value: "{{ mas_aibroker_db_user }}" + - name: mas_aibroker_db_database + value: "{{ mas_aibroker_db_database }}" + - name: mas_aibroker_db_secret_name + value: "{{ mas_aibroker_db_secret_name }}" + - name: mas_aibroker_db_secret_key + value: "{{ mas_aibroker_db_secret_key }}" + - name: mas_aibroker_db_secret_value + value: "{{ mas_aibroker_db_secret_value }}" +{%- endif %} From 8f37e932c8e9922ed212f52b968e4de1e2534155 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Tue, 13 Aug 2024 11:37:28 +0100 Subject: [PATCH 2/7] [patch] add missing aibroker parameter --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 618f9101..bf87e649 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -714,6 +714,16 @@ spec: secret: secretName: pipeline-certificates +{%- if install_aibroker is defined and install_aibroker != "" %} + + # IBM Maximo Location Services for Esri (arcgis) + # ------------------------------------------------------------------------- + - name: install_aibroker + value: "{{ install_aibroker }}" + - name: mas_aibroker_channel + value: "{{ mas_aibroker_channel }}" +{%- endif %} + {%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider!= "" %} # AI Broker - opendata hub storage dependencies # ------------------------------------------------------------------------- From 57ff7064e03f0ed38968dba5e61144f5c37d3633 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Wed, 14 Aug 2024 09:34:06 +0100 Subject: [PATCH 3/7] [patch] fix typo --- 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 bf87e649..16edc055 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -741,8 +741,8 @@ spec: value: "{{ mas_aibroker_storage_ssl }}" - name: mas_aibroker_storage_region value: "{{ mas_aibroker_storage_region }}" - - name: mas_aibroker_storage_piplines_bucket - value: "{{ mas_aibroker_storage_piplines_bucket }}" + - name: mas_aibroker_storage_pipelines_bucket + value: "{{ mas_aibroker_storage_pipelines_bucket }}" - name: mas_aibroker_storage_tenants_bucket value: "{{ mas_aibroker_storage_tenants_bucket }}" - name: mas_aibroker_storage_templates_bucket From 0b585d91088f496ac92be508f432905b8fe985ce Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 15 Aug 2024 11:13:32 +0100 Subject: [PATCH 4/7] [patch] fixed template pattern --- .../templates/pipelinerun-install.yml.j2 | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 16edc055..78080369 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -679,6 +679,12 @@ spec: value: "{{ grafana_instance_storage_size }}" {%- endif %} + # Certificates configurations + # ------------------------------------------------------------------------- + - name: shared-certificates + secret: + secretName: pipeline-certificates + workspaces: # The generated configuration files # ------------------------------------------------------------------------- @@ -708,12 +714,6 @@ spec: secret: secretName: pipeline-pod-templates - # Certificates configurations - # ------------------------------------------------------------------------- - - name: shared-certificates - secret: - secretName: pipeline-certificates - {%- if install_aibroker is defined and install_aibroker != "" %} # IBM Maximo Location Services for Esri (arcgis) @@ -723,8 +723,8 @@ spec: - name: mas_aibroker_channel value: "{{ mas_aibroker_channel }}" {%- endif %} - {%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider!= "" %} + # AI Broker - opendata hub storage dependencies # ------------------------------------------------------------------------- - name: mas_aibroker_storage_provider @@ -750,8 +750,8 @@ spec: - name: mas_aibroker_tenant_name value: "{{ mas_aibroker_tenant_name }}" {%- endif %} - {%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag!= "" %} + # AI Broker - kmodels apps tags dependencies # ------------------------------------------------------------------------- - name: mas_aibroker_controller_tag @@ -765,8 +765,8 @@ spec: - name: mas_aibroker_pipeline_steps_tag value: "{{ mas_aibroker_pipeline_steps_tag }}" {%- endif %} - {%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey!= "" %} + # AI Broker - aibroker app watsonX dependencies # ------------------------------------------------------------------------- - name: mas_aibroker_watsonxai_apikey @@ -778,8 +778,8 @@ spec: - name: mas_aibroker_watsonx_action value: "{{ mas_aibroker_watsonx_action }}" {%- endif %} - {%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action!= "" %} + # AI Broker - aibroker app secret create actions # ------------------------------------------------------------------------- - name: mas_aibroker_s3_action @@ -787,8 +787,8 @@ spec: - name: mas_aibroker_apikey_action value: "{{ mas_aibroker_apikey_action }}" {%- endif %} - {%- if mas_aibroker_db_host is defined and mas_aibroker_db_host!= "" %} + # AI Broker - mariaDB details for DataSciencePipelinesApplication dependencies # ------------------------------------------------------------------------- - name: mas_aibroker_db_host From 558b2cc0a708f4f1e79e3d97f60dc440bf367d0c Mon Sep 17 00:00:00 2001 From: David Parker Date: Fri, 23 Aug 2024 14:01:50 +0100 Subject: [PATCH 5/7] Update pipelinerun-install.yml.j2 --- .../templates/pipelinerun-install.yml.j2 | 83 +++++++++---------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 78080369..cc0fd2e5 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -678,45 +678,9 @@ spec: - name: grafana_instance_storage_size value: "{{ grafana_instance_storage_size }}" {%- endif %} - - # Certificates configurations - # ------------------------------------------------------------------------- - - name: shared-certificates - secret: - secretName: pipeline-certificates - - 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 - {%- if install_aibroker is defined and install_aibroker != "" %} - # IBM Maximo Location Services for Esri (arcgis) + # AI Broker # ------------------------------------------------------------------------- - name: install_aibroker value: "{{ install_aibroker }}" @@ -725,7 +689,7 @@ spec: {%- endif %} {%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider!= "" %} - # AI Broker - opendata hub storage dependencies + # AI Broker - OpenData Hub Storage # ------------------------------------------------------------------------- - name: mas_aibroker_storage_provider value: "{{ mas_aibroker_storage_provider }}" @@ -752,7 +716,7 @@ spec: {%- endif %} {%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag!= "" %} - # AI Broker - kmodels apps tags dependencies + # AI Broker - KModels Tags # ------------------------------------------------------------------------- - name: mas_aibroker_controller_tag value: "{{ mas_aibroker_controller_tag }}" @@ -767,7 +731,7 @@ spec: {%- endif %} {%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey!= "" %} - # AI Broker - aibroker app watsonX dependencies + # AI Broker - watsonX # ------------------------------------------------------------------------- - name: mas_aibroker_watsonxai_apikey value: "{{ mas_aibroker_watsonxai_apikey }}" @@ -780,7 +744,7 @@ spec: {%- endif %} {%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action!= "" %} - # AI Broker - aibroker app secret create actions + # AI Broker - S3 # ------------------------------------------------------------------------- - name: mas_aibroker_s3_action value: "{{ mas_aibroker_s3_action }}" @@ -789,7 +753,7 @@ spec: {%- endif %} {%- if mas_aibroker_db_host is defined and mas_aibroker_db_host!= "" %} - # AI Broker - mariaDB details for DataSciencePipelinesApplication dependencies + # AI Broker - Database (DataSciencePipelinesApplication) # ------------------------------------------------------------------------- - name: mas_aibroker_db_host value: "{{ mas_aibroker_db_host }}" @@ -806,3 +770,38 @@ spec: - name: mas_aibroker_db_secret_value value: "{{ mas_aibroker_db_secret_value }}" {%- endif %} + + workspaces: + # Certificates configurations + # ------------------------------------------------------------------------- + - name: shared-certificates + secret: + secretName: pipeline-certificates + + # 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 From cc203802c6ea06cc09ca7233b23bc5ad6f3d7991 Mon Sep 17 00:00:00 2001 From: David Parker Date: Fri, 23 Aug 2024 14:02:43 +0100 Subject: [PATCH 6/7] Update pipelinerun-install.yml.j2 --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index cc0fd2e5..3c4c6504 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -772,12 +772,6 @@ spec: {%- endif %} workspaces: - # Certificates configurations - # ------------------------------------------------------------------------- - - name: shared-certificates - secret: - secretName: pipeline-certificates - # The generated configuration files # ------------------------------------------------------------------------- - name: shared-configs @@ -805,3 +799,9 @@ spec: - name: shared-pod-templates secret: secretName: pipeline-pod-templates + + # Certificates configurations + # ------------------------------------------------------------------------- + - name: shared-certificates + secret: + secretName: pipeline-certificates From 40cba358f356c52342f301c7cc12e8047457e5c8 Mon Sep 17 00:00:00 2001 From: David Parker Date: Fri, 23 Aug 2024 14:03:41 +0100 Subject: [PATCH 7/7] Update pipelinerun-install.yml.j2 --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 3c4c6504..f55dac87 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -687,7 +687,7 @@ spec: - name: mas_aibroker_channel value: "{{ mas_aibroker_channel }}" {%- endif %} -{%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider!= "" %} +{%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider != "" %} # AI Broker - OpenData Hub Storage # ------------------------------------------------------------------------- @@ -714,7 +714,7 @@ spec: - name: mas_aibroker_tenant_name value: "{{ mas_aibroker_tenant_name }}" {%- endif %} -{%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag!= "" %} +{%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag != "" %} # AI Broker - KModels Tags # ------------------------------------------------------------------------- @@ -729,7 +729,7 @@ spec: - name: mas_aibroker_pipeline_steps_tag value: "{{ mas_aibroker_pipeline_steps_tag }}" {%- endif %} -{%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey!= "" %} +{%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey != "" %} # AI Broker - watsonX # ------------------------------------------------------------------------- @@ -742,7 +742,7 @@ spec: - name: mas_aibroker_watsonx_action value: "{{ mas_aibroker_watsonx_action }}" {%- endif %} -{%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action!= "" %} +{%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action != "" %} # AI Broker - S3 # ------------------------------------------------------------------------- @@ -751,7 +751,7 @@ spec: - name: mas_aibroker_apikey_action value: "{{ mas_aibroker_apikey_action }}" {%- endif %} -{%- if mas_aibroker_db_host is defined and mas_aibroker_db_host!= "" %} +{%- if mas_aibroker_db_host is defined and mas_aibroker_db_host != "" %} # AI Broker - Database (DataSciencePipelinesApplication) # -------------------------------------------------------------------------