[minor] DRO installation using cli command

docs/catalogs/v8-220717-amd64.md

@@ -58,7 +58,6 @@ IBM Maximo Application Suite will run anywhere that you can run a supported Open
     - User Data Services (UDS) is supported on Linux® x86_64 and OpenShift Container Platform versions 4.6, 4.7 and 4.8 only.
     - DB2, which is installed with ibm-db2u-operator, is supported on OpenShift Container Platform versions 4.6, 4.7, 4.8, and 4.9 only.
 
-
 Manifest
 -------------------------------------------------------------------------------
 

docs/catalogs/v8-221025-amd64.md

@@ -61,7 +61,6 @@ IBM Maximo Application Suite will run anywhere that you can run a supported Open
     - User Data Services (UDS) is supported on Linux® x86_64 and OpenShift Container Platform versions 4.6-4.10 only.
     - DB2, which is installed with ibm-db2u-operator, is supported on OpenShift Container Platform versions 4.6-4.9 only.
 
-
 Manifest
 -------------------------------------------------------------------------------
 

docs/catalogs/v8-221129-amd64.md

@@ -68,7 +68,6 @@ IBM Maximo Application Suite will run anywhere that you can run a supported Open
     - User Data Services (UDS) is supported on Linux® x86_64 and OpenShift Container Platform versions 4.6-4.10 only.
     - DB2, which is installed with ibm-db2u-operator, is supported on OpenShift Container Platform versions 4.6-4.9 only.
 
-
 Manifest
 -------------------------------------------------------------------------------
 

docs/catalogs/v8-221228-amd64.md

@@ -65,7 +65,6 @@ IBM Maximo Application Suite will run anywhere that you can run a supported Open
     - User Data Services (UDS) is supported on Linux® x86_64 and OpenShift Container Platform versions 4.8-4.10 only.
     - DB2, which is installed with ibm-db2u-operator, is supported on OpenShift Container Platform versions 4.8 and 4.10 only.
 
-
 Manifest
 -------------------------------------------------------------------------------
 

docs/commands/install.md

@@ -308,7 +308,7 @@ Provide your license ID and the location of your license file.
 
 
 ### Step 19. Configure UDS
-Maximo Application Suite's required integration with IBM User Data Services requires your e-mail address and first/last name be provided.
+Maximo Application Suite's required integration with either IBM User Data Services OR IBM Data Reporter Operator requires your e-mail address and first/last name be provided.
 
 
 ### Step 20. Prepare Installation

image/cli/mascli/functions/catalog_utils

@@ -103,6 +103,23 @@ function choose_mas_version() {
   esac
 }
 
+# Determine whether UDS or DRO Operator to use
+# -----------------------------------------------------------------------------
+# We automatically select the UDS or DRO operator to install in the
+# cluster based on the version of the catalog that is being used
+# TODO: Need to know the latest catalog version name
+function uds_dro_selection() {
+  case $MAS_CATALOG_VERSION in
+    # UDS/DRO selection
+    # -------------------------------------------------------------------------
+    v8-240111-amd64)
+      BAS_PROVIDER="DRO"
+      ;;
+    *)
+      BAS_PROVIDER="UDS" # The default channel will be used
+      ;;
+  esac
+}
 
 # Determine the version of Db2u Operator to use
 # -----------------------------------------------------------------------------

image/cli/mascli/functions/install

@@ -136,6 +136,7 @@ function install_noninteractive() {
   NON_INTERACTIVE=true
   DEV_MODE=false
   LICENSE_ACCEPTED=false
+  BAS_PROVIDER=UDS
 
   # Defaults
   DB2_ACTION_SYSTEM=none

image/cli/mascli/functions/mirror_to_registry

@@ -54,6 +54,7 @@ Content Selection (Cloud Pak for Data):
 Content Selection (Other Dependencies):
       --mirror-cfs                                  Mirror images for IBM Cloud Pak Foundation Services
       --mirror-uds                                  Mirror images for IBM User Data Services
+      --mirror-dro                                  Mirror images for IBM Data Reporter Operator
       --mirror-sls                                  Mirror images for IBM Suite License Service
       --mirror-tsm                                  Mirror images for IBM Truststore Manager
       --mirror-mongo                                Mirror images for MongoDb Community Edition
@@ -84,6 +85,7 @@ function mirror_to_registry_noninteractive() {
   MIRROR_CATALOG=false
   MIRROR_COMMONSERVICES=false
   MIRROR_UDS=false
+  MIRROR_DRO=false
   MIRROR_SLS=false
   MIRROR_TRUSTSTOREMGR=false
   MIRROR_MONGOCE=false
@@ -188,6 +190,9 @@ function mirror_to_registry_noninteractive() {
       --mirror-uds)
         MIRROR_UDS=true
         ;;
+      --mirror-dro)
+        MIRROR_DRO=true
+        ;;
       --mirror-sls)
         MIRROR_SLS=true
         ;;
@@ -324,6 +329,7 @@ function mirror_to_registry_interactive() {
     MIRROR_CATALOG=true
     MIRROR_COMMONSERVICES=true
     MIRROR_UDS=true
+    MIRROR_DRO=true
     MIRROR_SLS=true
     MIRROR_TRUSTSTOREMGR=true
     MIRROR_MONGOCE=true
@@ -351,6 +357,7 @@ function mirror_to_registry_interactive() {
 
     prompt_for_confirm_default_yes "IBM Foundational Services" MIRROR_COMMONSERVICES
     prompt_for_confirm_default_yes "IBM User Data Services" MIRROR_UDS
+    prompt_for_confirm_default_yes "IBM Data Reporter Operator" MIRROR_DRO
     prompt_for_confirm_default_yes "IBM Suite License Service" MIRROR_SLS
     prompt_for_confirm_default_yes "IBM Truststore Manager" MIRROR_TRUSTSTOREMGR
     prompt_for_confirm_default_yes "MongoDb Community Edition" MIRROR_MONGOCE
@@ -430,6 +437,7 @@ function mirror_to_registry() {
   export MIRROR_CATALOG
   export MIRROR_COMMONSERVICES
   export MIRROR_UDS
+  export MIRROR_DRO
   export MIRROR_SLS
   export MIRROR_TRUSTSTOREMGR
   export MIRROR_MONGOCE
@@ -451,6 +459,7 @@ function mirror_to_registry() {
   if [[ "$MIRROR_CATALOG" == true ||
     "$MIRROR_COMMONSERVICES" == true ||
     "$MIRROR_UDS" == true ||
+    "$MIRROR_DRO" == true ||
     "$MIRROR_SLS" == true ||
     "$MIRROR_TRUSTSTOREMGR" == true ||
     "$MIRROR_MONGOCE" == true ||
@@ -526,6 +535,7 @@ function mirror_to_registry() {
   echo_h4 "Content Selection (Other Dependencies)" "    "
   show_mirror_status "IBM Cloud Pak Foundation Services ..." $MIRROR_COMMONSERVICES
   show_mirror_status "IBM User Data Services .............." $MIRROR_UDS
+  show_mirror_status "IBM Data Reporter Oerator ..........." $MIRROR_DRO
   show_mirror_status "IBM Suite License Service ..........." $MIRROR_SLS
   show_mirror_status "IBM Truststore Manager .............." $MIRROR_TRUSTSTOREMGR
   show_mirror_status "MongoDb Community Edition ..........." $MIRROR_MONGOCE

image/cli/mascli/functions/pipeline_config

@@ -228,9 +228,13 @@ function pipeline_config() {
     SLS_ENTITLEMENT_FILE="/workspace/entitlement/$(basename $SLS_LICENSE_FILE_LOCAL)"
   fi
 
-  echo
+  # Check for DRO support in MAS
+  # ---------------------------------------------------------------------------
+  echo ""
+  uds_dro_selection
   echo_h2 "Configure UDS"
   prompt_for_input "UDS Contact Email" UDS_CONTACT_EMAIL
   prompt_for_input "UDS Contact First Name" UDS_CONTACT_FIRSTNAME
   prompt_for_input "UDS Contact Last Name" UDS_CONTACT_LASTNAME
+
 }

image/cli/mascli/functions/uninstall

@@ -85,6 +85,13 @@ function deps_prompt_conditions() {
       false
     fi
     ;;
+  DRO_ACTION)
+    if [[ ${IBM_CATALOGS_ACTION} == "uninstall" ]] || [[ ${COMMON_SERVICES_ACTION} == "uninstall" ]]; then
+      true
+    else
+      false
+    fi
+    ;;
   CERT_MANAGER_ACTION)
     if [[ ${IBM_CATALOGS_ACTION} == "uninstall" ]] || [[ ${COMMON_SERVICES_ACTION} == "uninstall" ]]; then
       true
@@ -132,6 +139,7 @@ function prompt_for_deps_to_uninstall() {
   validate_action_param "Uninstall IBM Common Services?" COMMON_SERVICES_ACTION
   validate_action_param "Uninstall IBM Cert Manager?" CERT_MANAGER_ACTION
   validate_action_param "Uninstall IBM User Data Services?" UDS_ACTION
+  validate_action_param "Uninstall IBM Data Reporter Operator?" DRO_ACTION
   validate_action_param "Uninstall MongoDB?" MONGODB_ACTION
   validate_action_param "Uninstall IBM Suite Licensing Service?" SLS_ACTION
 }
@@ -156,6 +164,7 @@ function review_uninstall_settings() {
   echo_reset_dim "IBM Common Services ............. Action: ${COLOR_MAGENTA}${COMMON_SERVICES_ACTION}"
   echo_reset_dim "IBM Cert Manager ................ Action: ${COLOR_MAGENTA}${CERT_MANAGER_ACTION}"
   echo_reset_dim "IBM User Data Services .......... Action: ${COLOR_MAGENTA}${UDS_ACTION}"
+  echo_reset_dim "IBM Data Reporter Operator....... Action: ${COLOR_MAGENTA}${DRO_ACTION}"
   echo_reset_dim "MongoDB ......................... Action: ${COLOR_MAGENTA}${MONGODB_ACTION}"
   echo_reset_dim "IBM Suite Licensing Service ..... Action: ${COLOR_MAGENTA}${SLS_ACTION}"
 

image/cli/mascli/functions/upgrade

@@ -114,6 +114,22 @@ function upgrade() {
   # Replace ALL environment variables in templates
   eval "echo \"$(cat $CLI_DIR/templates/pipelinerun-upgrade.yaml)\"" > $CONFIG_DIR/pipelinerun-$MAS_INSTANCE_ID-upgrade.yaml
 
+  # Check for UDS presence
+  SUBNAME=$(oc get subscription ibm-user-data-services-operator -n ibm-common-services --no-headers | awk -F" " {'print $1'})
+  #echo $SUBNAME
+  UDS=ibm-user-data-services-operator
+  if [[ "$SUBNAME" == "$UDS" ]]; then
+      #echo "UDS Installed"
+      uninstallUDS=y
+      DRO_ACTION="install"
+      prompt_for_input "UDS installation exist, do you want to unistall UDS and install DRO (y/N)" uninstallUDS
+      if  [[ "$uninstallUDS" == "y" ]]; then
+        UDS_ACTION="uninstall"        
+      fi
+  else
+      echo "UDS not installed"
+  fi
+
   # Start pipeline execution
   oc -n mas-$MAS_INSTANCE_ID-pipelines create -f $CONFIG_DIR/pipelinerun-$MAS_INSTANCE_ID-upgrade.yaml &>> $LOGFILE || exit 1
   echo -e "${COLOR_GREEN}Upgrade started successfully${COLOR_RESET}"

image/cli/mascli/templates/pipelinerun-install.yaml

@@ -246,6 +246,11 @@ spec:
     - name: uds_action
       value: '$UDS_ACTION'
 
+    # Dependencies - DRO (Required, no defaults)
+    # -------------------------------------------------------------------------
+    - name: dro_action
+      value: '$DRO_ACTION'
+
     # Dependencies - AppConnect
     # -------------------------------------------------------------------------
     - name: appconnect_entitlement_username

image/cli/mascli/templates/pipelinerun-uninstall.yaml

@@ -29,3 +29,5 @@ spec:
       value: "$SLS_ACTION"
     - name: uds_action
       value: "$UDS_ACTION"
+    - name: dro_action
+      value: "$DRO_ACTION"

tekton/generate-tekton-tasks.yml

@@ -43,6 +43,7 @@
         - sls
         - turbonomic
         - uds
+        - dro
 
     # 3. Generate Tasks (FVT)
     # -------------------------------------------------------------------------

tekton/src/params/install.yml.j2

@@ -240,20 +240,29 @@
 # -----------------------------------------------------------------------------
 - name: uds_contact_email
   type: string
+  default: ""
 - name: uds_contact_firstname
   type: string
+  default: ""
 - name: uds_contact_lastname
   type: string
+  default: ""
 - name: uds_event_scheduler_frequency
   type: string
   default: ""
 - name: uds_action
   type: string
-  default: "install"
+  default: ""
 - name: mas_segment_key
   type: string
   default: ""
 
+# Dependencies - DRO
+# -----------------------------------------------------------------------------
+- name: dro_action
+  type: string
+  default: ""
+
 # Dependencies - AppConnect
 # -----------------------------------------------------------------------------
 {{ lookup('template', params_src_dir ~ '/install-appconnect.yml.j2') }}

tekton/src/pipelines/fvt-manage-regr.yml.j2

@@ -92,6 +92,11 @@ spec:
       runAfter:
         - common-services
 
+    # 2.6 DRO
+    {{ lookup('template', 'taskdefs/dependencies/dro.yml.j2') | indent(4) }}
+      runAfter:
+        - common-services
+
 
     # 3. Other Dependecies
     # -------------------------------------------------------------------------

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

@@ -113,6 +113,10 @@ spec:
       runAfter:
         - common-services
 
+    # 2.6 DRO
+    {{ lookup('template', 'taskdefs/dependencies/dro.yml.j2') | indent(4) }}
+      runAfter:
+        - common-services
 
     # 3. Cloud Pak for Data
     # -------------------------------------------------------------------------

tekton/src/pipelines/install.yml.j2

@@ -105,6 +105,10 @@ spec:
       runAfter:
         - common-services
 
+    # 2.6 DRO
+    {{ lookup('template', 'taskdefs/dependencies/dro.yml.j2') | indent(4) }}
+      runAfter:
+        - common-services
 
     # 3. Cloud Pak for Data
     # -------------------------------------------------------------------------

tekton/src/pipelines/taskdefs/dependencies/dro.yml.j2

@@ -0,0 +1,34 @@
+- name: dro
+  params:
+    {{ lookup('template', 'taskdefs/common/cli-params.yml.j2') | indent(4) }}
+    - name: devops_suite_name
+      value: dependencies-dro
+
+    - name: mas_instance_id
+      value: $(params.mas_instance_id)
+
+    - name: dro_action
+      value: "$(params.dro_action)"
+
+    - name: dro_contact_email
+      value: "$(params.uds_contact_email)"
+    - name: dro_contact_firstname
+      value: "$(params.uds_contact_firstname)"
+    - name: dro_contact_lastname
+      value: "$(params.uds_contact_lastname)"
+    - name: custom_labels
+      value: $(params.custom_labels)
+    - name: ibm_entitlement_key
+      value: $(params.ibm_entitlement_key)
+  when:
+    - input: "$(params.dro_action)"
+      operator: in
+      values: ["install"]
+  taskRef:
+    kind: Task
+    name: mas-devops-dro
+  workspaces:
+    - name: configs
+      workspace: shared-configs
+    - name: pod-templates
+      workspace: shared-pod-templates

tekton/src/pipelines/taskdefs/dependencies/uds.yml.j2

@@ -9,7 +9,6 @@
 
     - name: uds_action
       value: "$(params.uds_action)"
-
     - name: uds_contact_email
       value: "$(params.uds_contact_email)"
     - name: uds_contact_firstname
@@ -20,11 +19,14 @@
       value: "$(params.uds_event_scheduler_frequency)"
     - name: uds_storage_class
       value: $(params.storage_class_rwo)
-
     - name: mas_segment_key
       value: $(params.mas_segment_key)
     - name: custom_labels
       value: $(params.custom_labels)
+  when:
+    - input: "$(params.uds_action)"
+      operator: in
+      values: ["install"]
   taskRef:
     kind: Task
     name: mas-devops-uds

tekton/src/pipelines/uninstall.yml.j2

@@ -61,6 +61,10 @@ spec:
       type: string
       description: Optional. Used to uninstall UDS
       default: "none"
+    - name: dro_action
+      type: string
+      description: Optional. Used to uninstall DRO
+      default: "none"
 
   tasks:
     # Content
@@ -308,6 +312,23 @@ spec:
       runAfter:
         - uninstall-mongodb
 
+    # 4. Uninstall Data Reporter Operator
+    # -------------------------------------------------------------------------
+    - name: uninstall-dro
+      params:
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: dro_action
+          value: $(params.dro_action)
+      taskRef:
+        kind: Task
+        name: mas-devops-dro
+      when:
+        - input: "$(params.dro_action)"
+          operator: in
+          values: ["uninstall"]
+      runAfter:
+        - uninstall-mongodb
 
     # 6. Uninstall IBM Cert Manager
     # -------------------------------------------------------------------------