[minor] Integrate aiservice into mas-install pipeline

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

@@ -60,7 +60,7 @@
     prepareAiServicePipelinesNamespace,
     prepareInstallSecrets,
     testCLI,
-    launchAiServiceInstallPipeline
+    launchInstallPipeline
 )
 
 logger = logging.getLogger(__name__)
@@ -347,7 +347,6 @@ def install(self, argv):
         # We use the presence of --mas-instance-id to determine whether
         # the CLI is being started in interactive mode or not
         instanceId = args.aiservice_instance_id
-
         # Properties for arguments that control the behavior of the CLI
         self.noConfirm = args.no_confirm
         self.waitForPVC = not args.no_wait_for_pvc
@@ -491,7 +490,7 @@ def install(self, argv):
                 h.stop_and_persist(symbol=self.successIcon, text=f"Latest Tekton definitions are installed (v{self.version})")
 
             with Halo(text=f"Submitting PipelineRun for {self.getParam('aiservice_instance_id')} install", spinner=self.spinner) as h:
-                pipelineURL = launchAiServiceInstallPipeline(dynClient=self.dynamicClient, params=self.params)
+                pipelineURL = launchInstallPipeline(dynClient=self.dynamicClient, params=self.params)
                 if pipelineURL is not None:
                     h.stop_and_persist(symbol=self.successIcon, text=f"PipelineRun for {self.getParam('aiservice_instance_id')} install submitted")
                     print_formatted_text(HTML(f"\nView progress:\n  <Cyan><u>{pipelineURL}</u></Cyan>\n"))

python/test/aiservice/install/test_app.py

@@ -52,7 +52,7 @@ def test_install_noninteractive(tmpdir):
             mock.patch('mas.cli.aiservice.install.app.getCurrentCatalog') as get_current_catalog,
             mock.patch('mas.cli.aiservice.install.app.installOpenShiftPipelines'),
             mock.patch('mas.cli.aiservice.install.app.updateTektonDefinitions'),
-            mock.patch('mas.cli.aiservice.install.app.launchAiServiceInstallPipeline') as launch_ai_service_install_pipeline
+            mock.patch('mas.cli.aiservice.install.app.launchInstallPipeline') as launch_ai_service_install_pipeline
         ):
             dynamic_client_class.return_value = dynamic_client
             get_nodes.return_value = [{'status': {'nodeInfo': {'architecture': 'amd64'}}}]
@@ -142,7 +142,7 @@ def test_install_interactive(tmpdir):
             mock.patch('mas.cli.aiservice.install.app.getCurrentCatalog') as get_current_catalog,
             mock.patch('mas.cli.aiservice.install.app.installOpenShiftPipelines'),
             mock.patch('mas.cli.aiservice.install.app.updateTektonDefinitions'),
-            mock.patch('mas.cli.aiservice.install.app.launchAiServiceInstallPipeline') as launch_ai_service_install_pipeline,
+            mock.patch('mas.cli.aiservice.install.app.launchInstallPipeline') as launch_ai_service_install_pipeline,
             mock.patch('mas.cli.cli.isSNO') as is_sno,
             mock.patch('mas.cli.displayMixins.prompt') as mixins_prompt,
             mock.patch('mas.cli.aiservice.install.app.prompt') as app_prompt,

tekton/generate-tekton-pipelines.yml

@@ -54,7 +54,6 @@
         - mas-ivt-manage
         - mas-fvt-facilities
         # AI Service Pipelines
-        - aiservice-install
         - aiservice-upgrade
         # AI Service FVT Pipelines
         - aiservice-fvt-launcher

tekton/generate-tekton-tasks.yml

@@ -52,7 +52,6 @@
         - minio
         - aiservice
         - odh
-        - aiservice-tenant
         - aiservice-upgrade
 
     # 4. Generate Tasks (FVT)

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

@@ -1,146 +1,3 @@
-# Cluster config
-# -----------------------------------------------------------------------------
-- name: ocp_ingress_tls_secret_name
-  type: string
-  default: ""
-
-# IBM Cloud
-# -----------------------------------------------------------------------------
-- name: ibmcloud_apikey
-  type: string
-  default: ""
-- name: ibmcloud_resourcegroup
-  type: string
-  default: ""
-
-# MAS (shouldn't really need these in AI service install pipeline)
-# -----------------------------------------------------------------------------
-- name: mas_icr_cp
-  type: string
-  default: ""
-- name: mas_icr_cpopen
-  type: string
-  default: ""
-- name: mas_workspace_id
-  type: string
-  description: Workspace ID used to configure all applications
-  default: ""
-
-# Certificate Manager
-# -----------------------------------------------------------------------------
-- name: cert_manager_provider
-  type: string
-  default: ""
-- name: cert_manager_action
-  type: string
-  default: ""
-
-# Dependencies - DB2
-# -----------------------------------------------------------------------------
-{{ lookup('template', params_src_dir ~ '/install-db2.yml.j2') }}
-- name: db2_action_aiservice
-  type: string
-  description: Set to 'install' to set up a Db2 instance for AI Service
-  default: "none"
-
-# Dependencies - DRO
-# -----------------------------------------------------------------------------
-- name: dro_contact_email
-  type: string
-  default: ""
-- name: dro_contact_firstname
-  type: string
-  default: ""
-- name: dro_contact_lastname
-  type: string
-  default: ""
-- name: dro_event_scheduler_frequency
-  type: string
-  default: ""
-- name: dro_action
-  type: string
-  default: ""
-- name: dro_namespace
-  type: string
-  default: ""
-- name: mas_segment_key
-  type: string
-  default: ""
-
-# Dependencies - SLS
-# -----------------------------------------------------------------------------
-- name: sls_namespace
-  type: string
-  default: ""
-- name: sls_entitlement_file
-  type: string
-  default: ""
-- name: sls_mongodb_cfg_file
-  type: string
-  # The default value works for the default in-cluster install, it will need
-  # to be modified if the mongodb namespace is changed, or if using BYO MongoDb
-  default: "/workspace/configs/mongo-mongoce.yml"
-- name: sls_catalog_source
-  type: string
-  default: ""
-- name: sls_channel
-  type: string
-  default: ""
-- name: sls_icr_cpopen
-  type: string
-  default: ""
-- name: sls_action
-  type: string
-  default: ""
-
-# Dependencies - MongoDb
-# -----------------------------------------------------------------------------
-- name: mongodb_namespace
-  type: string
-  default: ""
-- name: mongodb_storage_class
-  type: string
-  default: ""
-- name: mongodb_replicas
-  type: string
-  description: Optional configuration for mongodb replicas
-  default: ""
-- name: mongodb_cpu_requests
-  type: string
-  description: Optional configuration for mongodb cpu requests
-  default: ""
-- name: mongodb_provider
-  type: string
-  description: MongoDb provider
-  default: ""
-- name: mongodb_version
-  type: string
-  description: MongoDb version
-  default: ""
-- name: mongodb_action
-  type: string
-  description: MongoDb action
-  default: ""
-
-# Dependencies - IBM Cloud MongoDb
-# -------------------------------------------------------------------------
-- name: ibm_mongo_name
-  type: string
-  description: IBM Cloud MongoDb instance name
-  default: ""
-- name: ibm_mongo_resourcegroup
-  type: string
-  description: IBM Cloud MongoDb resource group
-  default: ""
-- name: ibm_mongo_region
-  type: string
-  description: IBM Cloud MongoDb instance region
-  default: ""
-- name: ibm_mongo_admin_password
-  type: string
-  description: IBM Cloud MongoDb admin password
-  default: ""
-
 # MAS Application Configuration - IBM Maximo AI Service
 # -----------------------------------------------------------------------------
 - name: aiservice_instance_id

tekton/src/params/install.yml.j2

@@ -209,6 +209,10 @@
   type: string
   description: Set to 'install' to set up a Db2 instance for Real Estate and Facilities
   default: "none"
+- name: db2_action_aiservice
+  type: string
+  description: Set to 'install' to set up a Db2 instance for AI Service
+  default: "none"
 
 # Dependencies - CP4D
 # -----------------------------------------------------------------------------
@@ -730,4 +734,8 @@
 - name: mas_ws_facilities_config_map_name
   description: ConfigMap with configurations not supported by Tekton
   type: string
-  default: ""
+  default: ""
+
+#  AI Service Configuration
+# -----------------------------------------------------------------------------
+{{ lookup('template', params_src_dir ~ '/install-aiservice.yml.j2') }}