[minor] User defined DRO namespace

image/cli/mascli/functions/install

@@ -65,7 +65,6 @@ function install_noninteractive() {
 
   WAIT_FOR_PVCS=true
   STORAGE_CLASS_PROVIDER=custom
-
   while [[ $# -gt 0 ]]
   do
     key="$1"
@@ -339,6 +338,10 @@ function install_noninteractive() {
       --uds-lastname)
         export UDS_CONTACT_LASTNAME=$1 && shift
         ;;
+      # DRO
+      --dro-namespace)
+        export DRO_NAMESPACE=$1 && shift
+        ;;
 
       # MongoDB
       --mongodb-namespace)
@@ -776,6 +779,12 @@ function install() {
   # DRO is installed by default on latest catalog version, for catalogs older than 240227 install UDS
   uds_action_selection
 
+  # Select DRO Namespace
+  if [[ "$INTERACTIVE_MODE" == "true" ]] && [[ "$UDS_ACTION" == "install-dro" ]]; then
+    prompt_for_input "Provide DRO Namespace [Default:'redhat-marketplace']" DRO_NAMESPACE "redhat-marketplace"
+    echo_highlight "DRO is configured to install in ${DRO_NAMESPACE} namespace"
+  fi
+
   # Prepare and launch the Tekton pipeline
   install_pipelinerun_prepare
   install_pipelinerun_preview

image/cli/mascli/functions/update

@@ -24,6 +24,7 @@ Update Dependencies (Optional):
   --dro-migration  ${COLOR_YELLOW}DRO_MIGRATION${TEXT_RESET}          Confirm the removal of UDS and replacement with DRO as part of the update
   --cp4d-version  ${COLOR_YELLOW}CP4D_VERSION${TEXT_RESET}            Optional. Set Cloud Pak for Data version for the upgrade. Note: This overrides the default CP4D version defined by the Maximo Operator Catalog version.
   --dro-storage-class  ${COLOR_YELLOW}DRO_STORAGE_CLASS${TEXT_RESET}  Set Custom RWO Storage Class name for DRO as part of the update
+  --dro-namespace  ${COLOR_YELLOW}DRO_NAMESPACE${TEXT_RESET}          Set Custom Namespace for DRO(Default: redhat-marketplace)
 Other Commands:
       --skip-pre-check                  Skips the 'pre-update-check' and 'post-update-verify' tasks in the update pipeline
       --no-confirm                      Launch the update without prompting for confirmation
@@ -176,6 +177,10 @@ function validate_dro_migration() {
           DRO_STORAGE_CLASS=""
           echo "No storage class selected for DRO"
         fi
+        if [[ "$NO_CONFIRM" != "true" ]] && [[ -z "${DRO_NAMESPACE}" ]]; then
+          prompt_for_input "Provide DRO Namespace [Default:'redhat-marketplace']" DRO_NAMESPACE "redhat-marketplace"
+          echo_highlight "DRO is configured to install in ${DRO_NAMESPACE} namespace"
+        fi
 
         ## Check all avaliable Suite Instance's versions, if any of them is 8.9.x cancel the update. Exit mas update throw error.
         for suite_namespace in $(oc get Suite --all-namespaces --ignore-not-found -o jsonpath='{.items[*].metadata.namespace}'); do
@@ -210,7 +215,6 @@ function validate_dro_migration() {
       else
         DRO_MIGRATION="false"
         echo -e "${COLOR_YELLOW}UDS does not exist, skipping DRO migration and proceeding with mas update"
-        DRO_NAMESPACE="redhat-marketplace"
         DRO_CSV=$(oc get csv -n "${DRO_NAMESPACE}" | grep ibm-data-reporter-operator | awk '{print $1}')
         echo $DRO_CSV
         if [[ -n $DRO_CSV ]]; then
@@ -604,6 +608,9 @@ function update_noninteractive() {
       --dro-migration)
         DRO_MIGRATION=true
         ;;
+      --dro-namespace)
+        DRO_NAMESPACE=$1 && shift
+        ;;
       --dro-storage-class)
         DRO_STORAGE_CLASS=$1 && shift
         ;;
@@ -739,6 +746,7 @@ function update() {
   export SKIP_ENTITLEMENT_KEY_FLAG
   export DRO_STORAGE_CLASS
   export UDS_ACTION
+  export DRO_NAMESPACE
 
   reset_colors
   echo_h2 "Review Settings"
@@ -868,6 +876,7 @@ function update() {
   if [ "$DRO_MIGRATION" = "true" ]; then
     echo_reset_dim "UDS to DRO ................................. ${COLOR_GREEN}Yes"
     echo_reset_dim " - DRO Storage Class ....................... ${COLOR_GREEN}${DRO_STORAGE_CLASS}"
+    echo_reset_dim " - DRO Namespace ........................... ${COLOR_GREEN}${DRO_NAMESPACE}"
   else
     echo_reset_dim "UDS to DRO ................................. ${COLOR_RED}Not Required"
   fi

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

@@ -252,7 +252,8 @@ spec:
       value: '$UDS_CONTACT_LASTNAME'
     - name: uds_action
       value: '$UDS_ACTION'
-
+    - name: dro_namespace
+      value: '$DRO_NAMESPACE'
     # Dependencies - AppConnect
     # -------------------------------------------------------------------------
     - name: appconnect_entitlement_username

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

@@ -48,6 +48,8 @@ spec:
       value: '$DRO_STORAGE_CLASS'
     - name: uds_action
       value: '$UDS_ACTION'
+    - name: dro_namespace
+      value: '$DRO_NAMESPACE'
     - name: grafana_v5_upgrade
       value: '$GRAFANA_V5_UPGRADE'
 

tekton/src/params/install.yml.j2

@@ -247,6 +247,9 @@
 - name: uds_action
   type: string
   default: ""
+- name: dro_namespace
+  type: string
+  default: ""
 - name: mas_segment_key
   type: string
   default: ""

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

@@ -27,6 +27,8 @@
     # Only used by DRO
     - name: ibm_entitlement_key
       value: $(params.ibm_entitlement_key)
+    - name: DRO_NAMESPACE
+      value: $(params.dro_namespace)
   when:
     - input: "$(params.uds_action)"
       operator: in

tekton/src/pipelines/update.yml.j2

@@ -128,6 +128,9 @@ spec:
       default: "install-dro"
       type: string
       description: set UDS_ACTION, default is install-dro'
+    - name: dro_namespace
+      default: "redhat-marketplace"
+      type: string
 
     # grafana operator update
     - name: grafana_v5_upgrade
@@ -378,6 +381,8 @@ spec:
           value: $(params.uds_storage_class)
         - name: uds_action
           value: $(params.uds_action)
+        - name: DRO_NAMESPACE
+          value: $(params.dro_namespace)
         - name: devops_suite_name
           value: update-uds
 {% if wait_for_install == true %}

tekton/src/tasks/dependencies/uds.yml.j2

@@ -45,6 +45,9 @@ spec:
     - name: ibm_entitlement_key
       type: string
       default: ""
+    - name: dro_namespace
+      type: string
+      default: "redhat-marketplace"
 
     # Used by UDS & DRO
     - name: uds_contact_email
@@ -144,6 +147,8 @@ spec:
           value: $(params.dro_migration)
         - name: DRO_STORAGE_CLASS
           value: $(params.uds_storage_class)
+        - name: DRO_NAMESPACE
+          value: $(params.dro_namespace)
   workspaces:
     - name: configs
       optional: true