From 6b23e9c54d58badffdd38e469e722c2549bdc638 Mon Sep 17 00:00:00 2001 From: David Parker Date: Sun, 24 Aug 2025 10:51:45 +0100 Subject: [PATCH 1/3] [patch] aiservice_storage to aiservice_s3 --- .../pipelinerun-aiservice-install.yml.j2 | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 index ed8d54cf..d448634e 100644 --- a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 @@ -224,27 +224,27 @@ spec: # AI Service - OpenData Hub Storage # ------------------------------------------------------------------------- - - name: aiservice_storage_provider - value: "{{ aiservice_storage_provider }}" - - name: aiservice_storage_accesskey - value: "{{ aiservice_storage_accesskey }}" - - name: aiservice_storage_secretkey - value: "{{ aiservice_storage_secretkey }}" - - name: aiservice_storage_host - value: "{{ aiservice_storage_host }}" - - name: aiservice_storage_port - value: "{{ aiservice_storage_port }}" - - name: aiservice_storage_ssl - value: "{{ aiservice_storage_ssl }}" - - name: aiservice_storage_region - value: "{{ aiservice_storage_region }}" - - - name: aiservice_storage_pipelines_bucket - value: "{{ aiservice_storage_pipelines_bucket }}" - - name: aiservice_storage_tenants_bucket - value: "{{ aiservice_storage_tenants_bucket }}" - - name: aiservice_storage_templates_bucket - value: "{{ aiservice_storage_templates_bucket }}" + - name: aiservice_s3_provider + value: "{{ aiservice_s3_provider }}" + - 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_pipelines_bucket + value: "{{ aiservice_s3_pipelines_bucket }}" + - 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 }}" From 4b7faeedf7fa60448d9caab8b3ae72b1789a1585 Mon Sep 17 00:00:00 2001 From: David Parker Date: Sun, 24 Aug 2025 16:34:09 +0100 Subject: [PATCH 2/3] Remove duplicate aiservice_s3_region param --- .../pipelinerun-aiservice-install.yml.j2 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 index d448634e..22d1d0ad 100644 --- a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 @@ -213,16 +213,7 @@ spec: - name: rsl_token value: "{{ rsl_token }}" - # S3 Buckets - # ------------------------------------------------------------------------- - - name: aiservice_s3_bucket_prefix - value: "{{ aiservice_s3_bucket_prefix }}" - - name: aiservice_s3_region - value: "{{ aiservice_s3_region }}" - - name: aiservice_s3_endpoint_url - value: "{{ aiservice_s3_endpoint_url }}" - - # AI Service - OpenData Hub Storage + # S3 # ------------------------------------------------------------------------- - name: aiservice_s3_provider value: "{{ aiservice_s3_provider }}" @@ -238,6 +229,11 @@ spec: value: "{{ aiservice_s3_ssl }}" - name: aiservice_s3_region value: "{{ aiservice_s3_region }}" + - name: aiservice_s3_endpoint_url + value: "{{ aiservice_s3_endpoint_url }}" + + - name: aiservice_s3_bucket_prefix + value: "{{ aiservice_s3_bucket_prefix }}" - name: aiservice_s3_pipelines_bucket value: "{{ aiservice_s3_pipelines_bucket }}" From 46c0f40537af3b8e217144502be26d68eb07579c Mon Sep 17 00:00:00 2001 From: Jasmin Makwana Date: Mon, 25 Aug 2025 18:39:22 +0530 Subject: [PATCH 3/3] [patch] Remove tenant specific s3 params (#98) --- .../pipelinerun-aiservice-install.yml.j2 | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 index 22d1d0ad..442af802 100644 --- a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 @@ -193,16 +193,6 @@ spec: value: "{{ tenant_entitlement_start_date }}" - name: tenant_entitlement_end_date value: "{{ tenant_entitlement_end_date }}" - - name: aiservice_tenant_s3_bucket_prefix - value: "{{ aiservice_tenant_s3_bucket_prefix }}" - - name: aiservice_tenant_s3_region - value: "{{ aiservice_tenant_s3_region }}" - - name: aiservice_tenant_s3_endpoint_url - value: "{{ aiservice_tenant_s3_endpoint_url }}" - - name: aiservice_tenant_s3_access_key - value: "{{ aiservice_tenant_s3_access_key }}" - - name: aiservice_tenant_s3_secret_key - value: "{{ aiservice_tenant_s3_secret_key }}" # RSL # ------------------------------------------------------------------------- @@ -215,8 +205,6 @@ spec: # S3 # ------------------------------------------------------------------------- - - name: aiservice_s3_provider - value: "{{ aiservice_s3_provider }}" - name: aiservice_s3_accesskey value: "{{ aiservice_s3_accesskey }}" - name: aiservice_s3_secretkey @@ -229,9 +217,6 @@ spec: value: "{{ aiservice_s3_ssl }}" - name: aiservice_s3_region value: "{{ aiservice_s3_region }}" - - name: aiservice_s3_endpoint_url - value: "{{ aiservice_s3_endpoint_url }}" - - name: aiservice_s3_bucket_prefix value: "{{ aiservice_s3_bucket_prefix }}" @@ -259,16 +244,6 @@ spec: - name: aiservice_watsonx_action value: "{{ aiservice_watsonx_action }}" -{%- if aiservice_s3_action is defined and aiservice_s3_action != "" %} - - # AI Service - S3 - # ------------------------------------------------------------------------- - - name: aiservice_s3_action - value: "{{ aiservice_s3_action }}" - - name: aiservice_apikey_action - value: "{{ aiservice_apikey_action }}" -{%- endif %} - workspaces: # The generated configuration files # -------------------------------------------------------------------------