From 8767260c787da7a16facc1608c55be5ae9aff8d8 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Mon, 5 May 2025 11:34:20 +0530 Subject: [PATCH 1/5] [patch] Add params for minio and mariadb --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 8c956bad..a98391a3 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -758,6 +758,11 @@ spec: value: "{{ mas_aibroker_storage_templates_bucket }}" - name: mas_aibroker_tenant_name value: "{{ mas_aibroker_tenant_name }}" + - name: minio_root_user + value: "{{ minio_root_user }}" + - name: minio_root_password + value: "{{ minio_root_password }}" + {%- endif %} {%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag != "" %} @@ -814,6 +819,13 @@ spec: value: "{{ mas_aibroker_db_secret_key }}" - name: mas_aibroker_db_secret_value value: "{{ mas_aibroker_db_secret_value }}" + - name: mariadb_user + value: "{{ mariadb_user }}" + - name: mariadb_password + value: "{{ mariadb_password }}" + - name: mariadb_database + value: "{{ mariadb_database }}" + {%- endif %} workspaces: From cf26f10ff26b94cddc02cbd4ae85bfb274311e20 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Mon, 5 May 2025 16:54:55 +0530 Subject: [PATCH 2/5] [patch] add params for aibroker-tenant --- 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 a98391a3..d730d355 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -731,6 +731,16 @@ spec: # ------------------------------------------------------------------------- - name: mas_app_channel_aibroker value: "{{ mas_app_channel_aibroker }}" + + # AI Broker 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 }}" + {%- endif %} {%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider != "" %} From 9960c7cb09835906e87a1333d9a1e18bad7cccaa Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Mon, 5 May 2025 21:55:09 +0530 Subject: [PATCH 3/5] [patch] remove extra vars for mariadb --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index d730d355..fac5b271 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -833,8 +833,6 @@ spec: value: "{{ mariadb_user }}" - name: mariadb_password value: "{{ mariadb_password }}" - - name: mariadb_database - value: "{{ mariadb_database }}" {%- endif %} From 5fabdf63bafe301508a0cbe7fc1f29257ea1c99e Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Thu, 8 May 2025 16:26:25 +0530 Subject: [PATCH 4/5] [patch] Add aibroker channel in v9-250109-amd64.yaml --- src/mas/devops/data/catalogs/v9-240827-amd64.yaml | 2 ++ src/mas/devops/data/catalogs/v9-250109-amd64.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/mas/devops/data/catalogs/v9-240827-amd64.yaml b/src/mas/devops/data/catalogs/v9-240827-amd64.yaml index da08e3ce..595fb232 100644 --- a/src/mas/devops/data/catalogs/v9-240827-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-240827-amd64.yaml @@ -62,6 +62,8 @@ mas_visualinspection_version: 9.0.x: 9.0.2 # Updated 8.10.x: 8.8.4 # No update 8.11.x: 8.9.5 # Updated +mas_aibroker_version: + 9.0.x: 9.0.1 # Extra Images for UDS # ------------------------------------------------------------------------------ diff --git a/src/mas/devops/data/catalogs/v9-250109-amd64.yaml b/src/mas/devops/data/catalogs/v9-250109-amd64.yaml index b6b71139..932b7a95 100644 --- a/src/mas/devops/data/catalogs/v9-250109-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250109-amd64.yaml @@ -77,6 +77,8 @@ mas_visualinspection_version: 9.0.x: 9.0.5 # No Update 8.10.x: 8.8.4 # No Update 8.11.x: 8.9.8 # No Update +mas_aibroker_version: + 9.0.x: 9.0.5 # Extra Images for UDS # ------------------------------------------------------------------------------ From 9705dfe59ffd35659e2ac54fa95b0775e6857267 Mon Sep 17 00:00:00 2001 From: Bhautik Vala Date: Mon, 12 May 2025 11:55:45 +0530 Subject: [PATCH 5/5] [patch] remove changes for catalog --- src/mas/devops/data/catalogs/v9-240827-amd64.yaml | 2 -- src/mas/devops/data/catalogs/v9-250109-amd64.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-240827-amd64.yaml b/src/mas/devops/data/catalogs/v9-240827-amd64.yaml index 595fb232..da08e3ce 100644 --- a/src/mas/devops/data/catalogs/v9-240827-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-240827-amd64.yaml @@ -62,8 +62,6 @@ mas_visualinspection_version: 9.0.x: 9.0.2 # Updated 8.10.x: 8.8.4 # No update 8.11.x: 8.9.5 # Updated -mas_aibroker_version: - 9.0.x: 9.0.1 # Extra Images for UDS # ------------------------------------------------------------------------------ diff --git a/src/mas/devops/data/catalogs/v9-250109-amd64.yaml b/src/mas/devops/data/catalogs/v9-250109-amd64.yaml index 932b7a95..b6b71139 100644 --- a/src/mas/devops/data/catalogs/v9-250109-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250109-amd64.yaml @@ -77,8 +77,6 @@ mas_visualinspection_version: 9.0.x: 9.0.5 # No Update 8.10.x: 8.8.4 # No Update 8.11.x: 8.9.8 # No Update -mas_aibroker_version: - 9.0.x: 9.0.5 # Extra Images for UDS # ------------------------------------------------------------------------------