[major] AI Broker / AI Service cleanup

Author: durera

src/mas/devops/data/catalogs/v9-250624-amd64.yaml

@@ -93,9 +93,10 @@ mas_facilities_version:
   9.0.x: ""       # Not Supported
   8.10.x: ""      # Not Supported
   8.11.x: ""      # Not Supported
-mas_aibroker_version:
+
+aiservice_version:
   9.1.x: 9.1.0
-  9.0.x: 9.0.6
+
 # Extra Images for UDS
 # ------------------------------------------------------------------------------
 uds_extras_version: 1.5.0

src/mas/devops/tekton.py

@@ -406,7 +406,7 @@ def launchInstallPipelineForAiservice(dynClient: DynamicClient, params: dict) ->
     """
     Create a PipelineRun to install the Aiservice
     """
-    instanceId = params["aibroker_instance_id"]
+    instanceId = params["aiservice_instance_id"]
     namespace = f"mas-{instanceId}-pipelines"
     timestamp = launchPipelineRun(dynClient, namespace, "pipelinerun-aiservice-install", params)
 

src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2

@@ -2,7 +2,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  name: "{{aibroker_instance_id}}-install-{{ timestamp }}"
+  name: "{{aiservice_instance_id}}-install-{{ timestamp }}"
   labels:
     tekton.dev/pipeline: aiservice-install
 spec:
@@ -250,8 +250,8 @@ spec:
 
     # Common params
     # -------------------------------------------------------------------------
-    - name: aibroker_instance_id
-      value: "{{ aibroker_instance_id }}"
+    - name: aiservice_instance_id
+      value: "{{ aiservice_instance_id }}"
     - name: mas_icr_cp
       value: "{{ mas_icr_cp }}"
     - name: mas_icr_cpopen
@@ -283,165 +283,165 @@ spec:
       value: "{{ install_dro_aiservice }}"
     - name: install_db2_aiservice
       value: "{{ install_db2_aiservice }}"
-    - name: mas_aibroker_dro_secret_name
-      value: "{{ mas_aibroker_dro_secret_name }}"
-    - name: mas_aibroker_dro_api_key
-      value: "{{ mas_aibroker_dro_api_key }}"
-    - name: mas_aibroker_dro_url
-      value: "{{ mas_aibroker_dro_url }}"
-    - name: mas_aibroker_dro_ca_cert
-      value: "{{ mas_aibroker_dro_ca_cert }}"
-    - name: mas_aibroker_db2_username
-      value: "{{ mas_aibroker_db2_username }}"
-    - name: mas_aibroker_db2_password
-      value: "{{ mas_aibroker_db2_password }}"
-    - name: mas_aibroker_db2_jdbc_url
-      value: "{{ mas_aibroker_db2_jdbc_url }}"
-    - name: mas_aibroker_db2_ssl_enabled
-      value: "{{ mas_aibroker_db2_ssl_enabled }}"
-    - name: mas_aibroker_db2_ca_cert
-      value: "{{ mas_aibroker_db2_ca_cert }}"
-    - name: mas_aibroker_sls_secret_name
-      value: "{{ mas_aibroker_sls_secret_name }}"
-    - name: mas_aibroker_sls_registration_key
-      value: "{{ mas_aibroker_sls_registration_key }}"
-    - name: mas_aibroker_sls_url
-      value: "{{ mas_aibroker_sls_url }}"
-    - name: mas_aibroker_sls_ca_cert
-      value: "{{ mas_aibroker_sls_ca_cert }}"
+    - name: aiservice_dro_secret_name
+      value: "{{ aiservice_dro_secret_name }}"
+    - name: aiservice_dro_api_key
+      value: "{{ aiservice_dro_api_key }}"
+    - name: aiservice_dro_url
+      value: "{{ aiservice_dro_url }}"
+    - name: aiservice_dro_ca_cert
+      value: "{{ aiservice_dro_ca_cert }}"
+    - name: aiservice_db2_username
+      value: "{{ aiservice_db2_username }}"
+    - name: aiservice_db2_password
+      value: "{{ aiservice_db2_password }}"
+    - name: aiservice_db2_jdbc_url
+      value: "{{ aiservice_db2_jdbc_url }}"
+    - name: aiservice_db2_ssl_enabled
+      value: "{{ aiservice_db2_ssl_enabled }}"
+    - name: aiservice_db2_ca_cert
+      value: "{{ aiservice_db2_ca_cert }}"
+    - 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 }}"
     - name: environment_type
       value: "{{ environment_type }}"
 
   {%- if install_db2_aiservice is defined and install_db2_aiservice == "false" %}
-    - name: db2_action_aibroker
+    - name: db2_action_aiservice
       value: "not_install"
   {%- endif %}
 
 
-    # AI Broker Tenant
+    # 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 }}"
-    - name: mas_aibroker_tenant_s3_bucket_prefix
-      value: "{{ mas_aibroker_tenant_s3_bucket_prefix }}"
-    - name: mas_aibroker_tenant_s3_region
-      value: "{{ mas_aibroker_tenant_s3_region }}"
-    - name: mas_aibroker_tenant_s3_endpoint_url
-      value: "{{ mas_aibroker_tenant_s3_endpoint_url }}"
-    - name: mas_aibroker_tenant_s3_access_key
-      value: "{{ mas_aibroker_tenant_s3_access_key }}"
-    - name: mas_aibroker_tenant_s3_secret_key
-      value: "{{ mas_aibroker_tenant_s3_secret_key }}"
+    - 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 }}"
     - name: rsl_url
       value: "{{ rsl_url }}"
     - name: rsl_org_id
       value: "{{ rsl_org_id }}"
     - name: rsl_token
       value: "{{ rsl_token }}"
-    - name: mas_aibroker_s3_bucket_prefix
-      value: "{{ mas_aibroker_s3_bucket_prefix }}"
-    - name: mas_aibroker_s3_region
-      value: "{{ mas_aibroker_s3_region }}"
-    - name: mas_aibroker_s3_endpoint_url
-      value: "{{ mas_aibroker_s3_endpoint_url }}"
-      
+    - 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 }}"
+
 {%- endif %}
-{%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider != "" %}
-
-    # AI Broker - OpenData Hub Storage
-    # -------------------------------------------------------------------------
-    - 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_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
-      value: "{{ mas_aibroker_storage_templates_bucket }}"
-    - name: mas_aibroker_tenant_name
-      value: "{{ mas_aibroker_tenant_name }}"
+{%- if aiservice_storage_provider is defined and aiservice_storage_provider != "" %}
+
+    # 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_tenant_name
+      value: "{{ aiservice_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 != "" %}
-
-    # AI Broker - KModels Tags
-    # -------------------------------------------------------------------------
-    - 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 }}"
+{%- if aiservice_controller_tag is defined and aiservice_controller_tag != "" %}
+
+    # AI Service - KModels Tags
+    # -------------------------------------------------------------------------
+    - name: aiservice_controller_tag
+      value: "{{ aiservice_controller_tag }}"
+    - name: aiservice_store_tag
+      value: "{{ aiservice_store_tag }}"
+    - name: aiservice_watcher_tag
+      value: "{{ aiservice_watcher_tag }}"
+    - name: aiservice_connector_tag
+      value: "{{ aiservice_connector_tag }}"
+    - name: aiservice_pipeline_steps_tag
+      value: "{{ aiservice_pipeline_steps_tag }}"
 {%- endif %}
-{%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey != "" %}
-
-    # AI Broker - watsonX
-    # -------------------------------------------------------------------------
-    - 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 }}"
+{%- if aiservice_watsonxai_apikey is defined and aiservice_watsonxai_apikey != "" %}
+
+    # 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 }}"
 {%- endif %}
-{%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action != "" %}
+{%- if aiservice_s3_action is defined and aiservice_s3_action != "" %}
 
-    # AI Broker - S3
+    # AI Service - S3
     # -------------------------------------------------------------------------
-    - name: mas_aibroker_s3_action
-      value: "{{ mas_aibroker_s3_action }}"
-    - name: mas_aibroker_apikey_action
-      value: "{{ mas_aibroker_apikey_action }}"
+    - name: aiservice_s3_action
+      value: "{{ aiservice_s3_action }}"
+    - name: aiservice_apikey_action
+      value: "{{ aiservice_apikey_action }}"
 {%- endif %}
-{%- if mas_aibroker_db_host is defined and mas_aibroker_db_host != "" %}
-
-    # AI Broker - Database (DataSciencePipelinesApplication)
-    # -------------------------------------------------------------------------
-    - 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 }}"
+{%- if aiservice_db_host is defined and aiservice_db_host != "" %}
+
+    # AI Service - Database (DataSciencePipelinesApplication)
+    # -------------------------------------------------------------------------
+    - name: aiservice_db_host
+      value: "{{ aiservice_db_host }}"
+    - name: aiservice_db_port
+      value: "{{ aiservice_db_port }}"
+    - name: aiservice_db_user
+      value: "{{ aiservice_db_user }}"
+    - name: aiservice_db_database
+      value: "{{ aiservice_db_database }}"
+    - name: aiservice_db_secret_name
+      value: "{{ aiservice_db_secret_name }}"
+    - name: aiservice_db_secret_key
+      value: "{{ aiservice_db_secret_key }}"
+    - name: aiservice_db_secret_value
+      value: "{{ aiservice_db_secret_value }}"
     - name: mariadb_user
       value: "{{ mariadb_user }}"
     - name: mariadb_password
       value: "{{ mariadb_password }}"
-    
+
 {%- endif %}
 
   workspaces: