diff --git a/image/cli/mascli/functions/pipeline_config_applications b/image/cli/mascli/functions/pipeline_config_applications index ddb4538a06..b0046bc7e2 100644 --- a/image/cli/mascli/functions/pipeline_config_applications +++ b/image/cli/mascli/functions/pipeline_config_applications @@ -173,6 +173,8 @@ 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 if prompt_for_confirm "+ Include industry solutions and add-ons"; then echo echo "${TEXT_DIM}Define which Manage Industry Solutions and Add-ons to be installed as part of the Manage base install." diff --git a/image/cli/mascli/templates/pipelinerun.yaml b/image/cli/mascli/templates/pipelinerun.yaml index 8631d070e2..5459434b1e 100644 --- a/image/cli/mascli/templates/pipelinerun.yaml +++ b/image/cli/mascli/templates/pipelinerun.yaml @@ -329,6 +329,8 @@ spec: - name: mas_appws_components value: '$MAS_APPWS_COMPONENTS' + - 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 diff --git a/tekton/src/params/install.yml.j2 b/tekton/src/params/install.yml.j2 index 314c002106..db15352aa5 100644 --- a/tekton/src/params/install.yml.j2 +++ b/tekton/src/params/install.yml.j2 @@ -501,6 +501,12 @@ description: Defines if Manage database encryption secret should be overriden with new values provided 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 diff --git a/tekton/src/pipelines/install-with-fvt.yml.j2 b/tekton/src/pipelines/install-with-fvt.yml.j2 index 30120912bb..d54aeaa04f 100644 --- a/tekton/src/pipelines/install-with-fvt.yml.j2 +++ b/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) }} diff --git a/tekton/src/pipelines/install.yml.j2 b/tekton/src/pipelines/install.yml.j2 index 835c492e21..afe2c2474e 100644 --- a/tekton/src/pipelines/install.yml.j2 +++ b/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) }} diff --git a/tekton/src/pipelines/taskdefs/apps/manage-workspace.yml.j2 b/tekton/src/pipelines/taskdefs/apps/manage-workspace.yml.j2 index 8554ca8c8f..04a9efcd53 100644 --- a/tekton/src/pipelines/taskdefs/apps/manage-workspace.yml.j2 +++ b/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 diff --git a/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 b/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 index ec264ebade..38d1d48701 100644 --- a/tekton/src/pipelines/taskdefs/core/suite-config-wsl.yml.j2 +++ b/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: diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 index f3b7b401d8..43516092d1 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-platform.yml.j2 +++ b/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: [""] \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 b/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 index 57ae19cc2a..217bc91f4e 100644 --- a/tekton/src/pipelines/taskdefs/cp4d/cp4d-wsl.yml.j2 +++ b/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: diff --git a/tekton/src/tasks/suite-app-config.yml.j2 b/tekton/src/tasks/suite-app-config.yml.j2 index b7d17538f6..7d92260e59 100644 --- a/tekton/src/tasks/suite-app-config.yml.j2 +++ b/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: "" - name: mas_app_settings_crypto_key type: string description: Manage database encryption key for MXE_SECURITY_CRYPTO_KEY @@ -145,10 +155,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 @@ -173,6 +179,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 @@ -187,6 +197,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 @@ -247,8 +259,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