[patch] Add support for aibroker 9.1.x

image/cli/masfvt/fvt-aibroker.yml

@@ -0,0 +1,43 @@
+---
+- hosts: localhost
+  any_errors_fatal: true
+  vars:
+    # Image Pull Policy
+    image_pull_policy: "{{ lookup('env', 'IMAGE_PULL_POLICY') }}"
+    # MAS Details
+    mas_app_channel_aibroker: "{{ lookup('env', 'MAS_APP_CHANNEL_AIBROKER') }}"
+    mas_instance_id: "{{ lookup('env', 'MAS_INSTANCE_ID') }}"
+    mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') }}"
+    # FVT Configuration
+    fvt_image_registry: "{{ lookup('env', 'FVT_IMAGE_REGISTRY') }}"
+    fvt_artifactory_username: "{{ lookup('env', 'FVT_ARTIFACTORY_USERNAME') }}"
+    fvt_artifactory_token: "{{ lookup('env', 'FVT_ARTIFACTORY_TOKEN') }}"
+    fvt_digest_ctf: "{{ lookup('env', 'FVT_DIGEST_CTF') }}"
+    fvt_digest_aibroker: "{{ lookup('env', 'FVT_DIGEST_AIBROKER') }}"
+    ivt_digest_core: "{{ lookup('env', 'IVT_DIGEST_CORE') }}"
+    # Pipeline Run Info
+    devops_build_number: "{{ lookup('env', 'DEVOPS_BUILD_NUMBER') | default('0', True) }}"
+    pipelinerun_name: "{{ lookup('env', 'PIPELINERUN_NAME') | default('mas-fvt-aibroker', True) }}-{{ devops_build_number }}"
+    pipelinerun_namespace: "{{ lookup('env', 'PIPELINERUN_NAMESPACE') | default('mas-' ~ mas_instance_id ~ '-pipelines', True) }}"
+  tasks:
+    - name: "Debug"
+      debug:
+        msg:
+          - "pipelinerun_name .................. {{ pipelinerun_name }}"
+          - "pipelinerun_namespace ............. {{ pipelinerun_namespace }}"
+          - ""
+          - "mas_app_channel_aibroker ........... {{ mas_app_channel_aibroker }}"
+          - "mas_instance_id ................... {{ mas_instance_id }}"
+          - "mas_workspace_id .................. {{ mas_workspace_id }}"
+          - ""
+          - "fvt_image_registry ................ {{ fvt_image_registry }}"
+          - "fvt_artifactory_username .......... {{ fvt_artifactory_username }}"
+          - "fvt_artifactory_token ............. {{ fvt_artifactory_token }}"
+          - "fvt_digest_ctf .................... {{ fvt_digest_ctf }}"
+          - "fvt_digest_aibroker ................ {{ fvt_digest_aibroker }}"
+          - "ivt_digest_core ................... {{ ivt_digest_core }}"
+
+    - name: "Start fvt-aibroker pipeline"
+      kubernetes.core.k8s:
+        apply: true
+        template: templates/mas-fvt-aibroker.yml.j2

image/cli/masfvt/templates/mas-fvt-aibroker.yml.j2

@@ -0,0 +1,49 @@
+---
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: "{{ pipelinerun_name }}"
+  namespace: "{{ pipelinerun_namespace }}"
+  labels:
+    tekton.dev/pipeline: mas-fvt-aibroker
+spec:
+  pipelineRef:
+    name: mas-fvt-aibroker
+
+  serviceAccountName: pipeline
+  timeouts:
+    pipeline: "8h"
+
+  params:
+    # Pull Policy
+    - name: image_pull_policy
+      value: "{{ image_pull_policy }}"
+    # MAS Info
+    - name: mas_app_channel_aibroker
+      value: "{{ mas_app_channel_aibroker }}"
+    - name: mas_instance_id
+      value: "{{ mas_instance_id }}"
+    - name: mas_workspace_id
+      value: "{{ mas_workspace_id }}"
+    # Registry
+    - name: fvt_image_registry
+      value: "{{ fvt_image_registry }}"
+    - name: fvt_artifactory_username
+      value: "{{ fvt_artifactory_username }}"
+    - name: fvt_artifactory_token
+      value: "{{ fvt_artifactory_token }}"
+    # Digests
+    - name: fvt_digest_aibroker
+      value: "{{ fvt_digest_aibroker }}"
+    - name: ivt_digest_core
+      value: "{{ ivt_digest_core }}"
+
+  workspaces:
+    # The generated configuration files
+    - name: shared-configs
+      persistentVolumeClaim:
+        claimName: config-pvc
+    # PodTemplates configurations
+    - name: shared-pod-templates
+      secret:
+        secretName: pipeline-pod-templates

python/src/mas/cli/install/app.py

@@ -175,6 +175,7 @@ def processCatalogChoice(self) -> list:
                 "Optimizer": "mas_optimizer_version",
                 "Predict": "mas_predict_version",
                 "Inspection": "mas_visualinspection_version",
+                "Aibroker": "mas_aibroker_version",
             }
         else:
             applications = {

python/src/mas/cli/install/argParser.py

@@ -514,6 +514,56 @@ def isValidFile(parser, arg) -> str:
     required=False,
     help="Customize Manage database encryption keys"
 )
+aibrokerArgGroup.add_argument(
+    "--minio-root-user",
+    dest="minio_root_user",
+    required=False,
+    help="Root user for minio"
+)
+aibrokerArgGroup.add_argument(
+    "--minio-root-password",
+    dest="minio_root_password",
+    required=False,
+    help="Password for minio rootuser"
+)
+aibrokerArgGroup.add_argument(
+    "--mariadb-user",
+    dest="mariadb_user",
+    required=False,
+    help="Mariadb user name"
+)
+aibrokerArgGroup.add_argument(
+    "--mariadb-password",
+    dest="mariadb_password",
+    required=False,
+    help="Password for mariadb user"
+)
+aibrokerArgGroup.add_argument(
+    "--tenant-entitlement-type",
+    dest="tenant_entitlement_type",
+    required=False,
+    help="Type of aibroker tenant"
+)
+aibrokerArgGroup.add_argument(
+    "--tenant-entitlement-start-date",
+    dest="tenant_entitlement_start_date",
+    required=False,
+    help="Start date for Aibroker tenant"
+)
+aibrokerArgGroup.add_argument(
+    "--tenant-entitlement-end-date",
+    dest="tenant_entitlement_end_date",
+    required=False,
+    help="End date for Aibroker tenant"
+)
+aibrokerArgGroup.add_argument(
+    "--aibroker-stand-alone",
+    dest="aibroker_stand_alone",
+    required=False,
+    help="Install stand-alone aibroker without MAS",
+    action="store_const",
+    const="true"
+)
 
 # Arcgis
 # -----------------------------------------------------------------------------

python/src/mas/cli/install/params.py

@@ -175,6 +175,14 @@
     "mas_aibroker_db_secret_name",
     "mas_aibroker_db_secret_key",
     "mas_aibroker_db_secret_value",
+    "mariadb_user",
+    "mariadb_password",
+    "minio_root_user",
+    "minio_root_password",
+    "tenant_entitlement_type",
+    "tenant_entitlement_start_date",
+    "tenant_entitlement_end_date",
+    "aibroker_stand_alone",
     # Special chars
     "mas_special_characters"
 ]

python/src/mas/cli/install/settings/manageSettings.py

@@ -275,6 +275,9 @@ def aibrokerSettings(self) -> None:
             self.printH2("Maximo AI Broker Settings - Storage, WatsonX, MariaDB details")
             self.printDescription(["Customise AI Broker details"])
             self.promptForString("Storage provider", "mas_aibroker_storage_provider")
+            if self.getParam("mas_aibroker_storage_provider") == "minio":
+                self.promptForString("minio root username", "minio_root_user")
+                self.promptForString("minio root password", "minio_root_password")
             self.promptForString("Storage access key", "mas_aibroker_storage_accesskey")
             self.promptForString("Storage secret key", "mas_aibroker_storage_secretkey")
             self.promptForString("Storage host", "mas_aibroker_storage_host")
@@ -289,9 +292,15 @@ def aibrokerSettings(self) -> None:
             self.promptForString("Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
             self.promptForString("Watsonxai project id", "mas_aibroker_watsonxai_project_id")
 
+            self.promptForString("Mariadb username", "mariadb_user")
+            self.promptForString("Mariadb password", "mariadb_password")
+
             self.promptForString("Database host", "mas_aibroker_db_host")
             self.promptForString("Database port", "mas_aibroker_db_port")
             self.promptForString("Database user", "mas_aibroker_db_user")
             self.promptForString("Database name", "mas_aibroker_db_database")
             self.promptForString("Database Secretname", "mas_aibroker_db_secret_name")
             self.promptForString("Database password", "mas_aibroker_db_secret_value")
+            self.promptForString("Tenant entitlement type", "tenant_entitlement_type")
+            self.promptForString("Tenant start date", "tenant_entitlement_start_date")
+            self.promptForString("Tenant end date", "tenant_entitlement_end_date")

python/src/mas/cli/install/summarizer.py

@@ -176,6 +176,14 @@ def aibrokerSummary(self) -> None:
             self.printParamSummary("  + Database name", "mas_aibroker_db_database")
             self.printParamSummary("  + Database Secretname", "mas_aibroker_db_secret_name")
             self.printParamSummary("  + Database password", "mas_aibroker_db_secret_value")
+            if self.getParam("mas_aibroker_storage_provider") == "minio":
+                self.printParamSummary("  + minio root username", "minio_root_user")
+                self.printParamSummary("  + minio root password", "minio_root_password")
+            self.printParamSummary("  + Mariadb username", "mariadb_user")
+            self.printParamSummary("  + Mariadb password", "mariadb_password")
+            self.printParamSummary("  + Tenant entitlement type", "tenant_entitlement_type")
+            self.printParamSummary("  + Tenant start date", "tenant_entitlement_start_date")
+            self.printParamSummary("  + Tenant end date", "tenant_entitlement_end_date")
         else:
             self.printSummary("AI Broker", "Do Not Install")
 

tekton/generate-tekton-pipelines.yml

@@ -47,6 +47,7 @@
         - fvt-monitor
         - fvt-optimizer
         - fvt-predict
+        - fvt-aibroker
         - fvt-sls
         - fvt-visualinspection
         - fvt-launcher

tekton/generate-tekton-tasks.yml

@@ -50,9 +50,12 @@
         src: "{{ task_src_dir }}/aibroker/{{ item }}.yml.j2"
         dest: "{{ task_target_dir }}/{{ item }}.yaml"
       with_items:
+        - minio
+        - mariadb
         - aibroker
         - kmodels
         - odh
+        - aibroker-tenant
 
     # 4. Generate Tasks (FVT)
     # -------------------------------------------------------------------------
@@ -103,6 +106,7 @@
         - launchfvt-monitor
         - launchfvt-optimizer
         - launchfvt-predict
+        - launchfvt-aibroker
         - launchfvt-visualinspection
         - launchfvt-upgrade-post
         - launchfvt-upgrade-pre

tekton/src/params/install-aibroker.yml.j2

@@ -121,3 +121,39 @@
   type: string
   description: database secret value for IBM Maximo AI Broker
   default: ""
+- name: minio_root_user
+  type: string
+  description: root user for minio
+  default: ""
+- name: minio_root_password
+  type: string
+  description: password for minio root user
+  default: ""
+- name: mariadb_user
+  type: string
+  description: user for mariadb
+  default: ""
+- name: mariadb_password
+  type: string
+  description: password for mariadb user
+  default: ""
+- name: tenant_entitlement_type
+  type: string
+  description: type of tenant
+  default: ""
+- name: tenant_entitlement_start_date
+  type: string
+  description: define start date for tenant 
+  default: ""
+- name: tenant_entitlement_end_date
+  type: string
+  description: define end date for tenant
+  default: ""
+- name: db2_action_aibroker
+  type: string
+  description: install dedicated db2 for aibroker
+  default: "install"
+- name: aibroker_stand_alone
+  type: string
+  description: install aibroker stand-alone without MAS
+  default: "false"