[minor] Optional Watson Studio bind to Health

image/cli/mascli/functions/pipeline_config_applications

@@ -152,7 +152,7 @@ function config_pipeline_applications() {
       prompt_for_input "Tablespace" MAS_APP_SETTINGS_TABLESPACE
       prompt_for_input "Indexspace" MAS_APP_SETTINGS_INDEXSPACE
     fi
-     if prompt_for_confirm "+ Include customization archive"; then
+    if prompt_for_confirm "+ Include customization archive"; then
       MAS_APP_SETTINGS_CUSTOMIZATION_ARCHIVE_NAME='manage-custom-archive'
       prompt_for_input "Customization archive name" MAS_APP_SETTINGS_CUSTOMIZATION_ARCHIVE_NAME
       prompt_for_input "Customization archive url" MAS_APP_SETTINGS_CUSTOMIZATION_ARCHIVE_URL
@@ -161,6 +161,9 @@ function config_pipeline_applications() {
         prompt_for_secret "Password" MAS_APP_SETTINGS_CUSTOMIZATION_ARCHIVE_PASSWORD
       fi
     fi
+    if prompt_for_confirm "+ Install and bind Watson Studio"; then
+      MAS_APPWS_BINDINGS_HEALTH_WSL_FLAG=true
+    fi
   fi
 
   # Optimizer, Predict, Visual Inspection, & Assist haven't been tested on Single Node OpenShift

image/cli/mascli/templates/pipelinerun.yaml

@@ -327,6 +327,8 @@ spec:
     - name: mas_app_channel_manage
       value: '$MAS_APP_CHANNEL_MANAGE'
 
+    - name: mas_appws_bindings_health_wsl_flag
+      value: '$MAS_APPWS_BINDINGS_HEALTH_WSL_FLAG'
     - name: mas_app_settings_aio_flag
       value: '$MAS_APP_SETTINGS_AIO_FLAG'
     - name: mas_app_settings_demodata

tekton/src/params/install.yml.j2

@@ -481,6 +481,12 @@
   description: Password to authenticate into Manage custom archive url (if required)
   default: ""
 
+# MAS Application Configuration - Health Application
+- name: mas_appws_bindings_health_wsl_flag
+  type: string
+  description: Boolean value indicating if Watson Studio must installed and bound to Manage/Health.
+  default: ""
+
 # MAS Application Configuration - Optimizer Application
 # -----------------------------------------------------------------------------
 - name: mas_app_plan_optimizer

tekton/src/pipelines/install-with-fvt.yml.j2

@@ -265,6 +265,7 @@ spec:
       runAfter:
         - suite-db2-setup-system
         - suite-db2-setup-manage
+        - suite-config-watson-studio
 
     # 8.3 Configure Manage workspace
     {{ lookup('template', 'taskdefs/apps/manage-workspace.yml.j2') | indent(4) }}

tekton/src/pipelines/install.yml.j2

@@ -249,6 +249,7 @@ spec:
       runAfter:
         - suite-db2-setup-system
         - suite-db2-setup-manage
+        - suite-config-watson-studio
 
     # 8.3 Configure Manage workspace
     {{ lookup('template', 'taskdefs/apps/manage-workspace.yml.j2') | indent(4) }}

tekton/src/pipelines/taskdefs/apps/manage-workspace.yml.j2

@@ -17,6 +17,8 @@
       value: "$(params.mas_appws_components)"
     - name: mas_appws_bindings_jdbc
       value: "$(params.mas_appws_bindings_jdbc_manage)"
+    - name: mas_appws_bindings_health_wsl_flag
+      value: $(params.mas_appws_bindings_health_wsl_flag)
     - name: mas_app_settings_aio_flag
       value: $(params.mas_app_settings_aio_flag)
     - name: mas_app_settings_demodata

tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2

@@ -11,7 +11,7 @@
     name: mas-devops-suite-config
   # Only needed if either Predict or HPUtilities are being installed
   when:
-    - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_hputilities)"
+    - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_hputilities)$(params.mas_appws_bindings_health_wsl_flag)"
       operator: notin
       values: [""]
   workspaces:

tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2

@@ -13,6 +13,6 @@
     name: mas-devops-cp4d
   # Only needed if either Predict, HPUtilities or Assist are being installed
   when:
-    - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_hputilities)$(params.mas_app_channel_assist)"
+    - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_hputilities)$(params.mas_app_channel_assist)$(params.mas_appws_bindings_health_wsl_flag)"
       operator: notin
       values: [""]

tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2

@@ -20,7 +20,7 @@
     name: mas-devops-cp4d-service
   # Only needed if either Predict or HPUtilities are being installed
   when:
-    - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_hputilities)"
+    - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_hputilities)$(params.mas_appws_bindings_health_wsl_flag)"
       operator: notin
       values: [""]
   workspaces:

tekton/src/tasks/suite-app-config.yml.j2

@@ -11,6 +11,12 @@ spec:
     - name: mas_instance_id
       type: string
       description: Instance ID
+
+    # CPD Version
+    - name: cpd_product_version
+      type: string
+      description: The version of Cloud Pak for Data installed in the cluster, used to determine the version of WSL or WML for Health or Predict.
+      default: ""
 
     # Application Workspace - identifier
     - name: mas_app_id
@@ -31,6 +37,10 @@ spec:
       default: ""
 
     # Application Workspace - Operand (Manage)
+    - name: mas_appws_bindings_health_wsl_flag
+      type: string
+      description: Boolean value indicating if Watson Studio must installed and bound to Manage/Health.
+      default: ""
     - name: mas_app_settings_aio_flag
       type: string
       description: Flag indicating if Asset Investment Optimization (AIO) resource must be loaded or not. It can be loaded only when Optimizer application is installed.
@@ -106,7 +116,7 @@ spec:
     - name: mas_app_settings_customization_archive_password
       type: string
       description: Password to authenticate into Manage custom archive url (if required)
-      default: ""
+      default: "" 
 
     # Application Workspace - Operand (Predict)
     - name: predict_deployment_size
@@ -125,10 +135,6 @@ spec:
       default: ""
 
     # Application Workspace - Operand (Watson Machine Learning - Predict only)
-    - name: cpd_product_version
-      type: string
-      description: The version of Cloud Pak for Data installed in the cluster, used to determine the version of WML.
-      default: ""
     - name: cpd_wml_instance_id
       type: string
       description: Optional. Identifier of wml instance to be configured in Predict
@@ -153,6 +159,10 @@ spec:
         value: /workspace/configs
       - name: MAS_INSTANCE_ID
         value: $(params.mas_instance_id)
+
+      # CPD Version
+      - name: CPD_PRODUCT_VERSION
+        value: $(params.cpd_product_version)
 
       # Application Workspace - Identifer
       - name: MAS_APP_ID
@@ -167,6 +177,8 @@ spec:
         value: $(params.mas_appws_components)
 
       # Application Workspace - Operand (Manage)
+      - name: MAS_APPWS_BINDINGS_HEALTH_WSL_FLAG
+        value: $(params.mas_appws_bindings_health_wsl_flag)
       - name: MAS_APP_SETTINGS_AIO_FLAG
         value: $(params.mas_app_settings_aio_flag)
       - name: MAS_APP_SETTINGS_DEMODATA
@@ -217,8 +229,6 @@ spec:
         value: $(params.cpd_wsl_project_name)
 
       # Application Workspace - Operand (WML)
-      - name: CPD_PRODUCT_VERSION
-        value: $(params.cpd_product_version)
       - name: CPD_WML_INSTANCE_ID
         value: $(params.cpd_wml_instance_id)
       - name: CPD_WML_URL