delete bedrock related catalogsource and increase waiting time for delete operandrequest (#2658)

* delete bedrock related catalogsource and increase waiting time for delete opreq

Signed-off-by: Allen Li <liyuchen223@gmail.com>

* update catalogsource name

Signed-off-by: Allen Li <liyuchen223@gmail.com>

---------

Signed-off-by: Allen Li <liyuchen223@gmail.com>

Author: qpdpQ

cp3pt0-deployment/uninstall_tenant.sh

@@ -194,7 +194,7 @@ function uninstall_odlm() {
     for ns in ${TENANT_NAMESPACES//,/ }; do
         local opreq=$(${OC} get -n "$ns" operandrequests --no-headers | cut -d ' ' -f1)
         if [ "$opreq" != "" ]; then
-            ${OC} delete -n "$ns" operandrequests ${opreq//$'\n'/ } --timeout=30s
+            ${OC} delete -n "$ns" operandrequests ${opreq//$'\n'/ } --timeout=60s
         fi
         grep_args="${grep_args}-e $ns "
     done
@@ -411,9 +411,10 @@ function cleanup_extra_resources() {
         ${OC} delete certificate cs-ca-certificate -n $ns --ignore-not-found
         ${OC} delete configmap cloud-native-postgresql-image-list ibm-cpp-config -n $ns --ignore-not-found
         ${OC} delete secret common-service-db-im-tls-secret postgresql-operator-controller-manager-config cs-ca-certificate-secret common-service-db-tls-secret common-service-db-replica-tls-secret common-service-db-zen-tls-secret -n $ns --ignore-not-found
-        ${OC} delete commonservice common-service -n $ns --ignore-not-found
+        ${OC} delete commonservice common-service im-common-service -n $ns --ignore-not-found
         ${OC} delete operandconfig common-service -n $ns --ignore-not-found
         ${OC} delete operandregistry common-service -n $ns --ignore-not-found
+        ${OC} delete catalogsource opencloud-operators ibm-cs-install-catalog ibm-cs-iam-catalog -n $ns --ignore-not-found
         info "Remaining resources (minus package manifests and events) in namespace $ns:"
         ${OC} get "$(${OC} api-resources --namespaced=true --verbs=list -o name | awk '{printf "%s%s",sep,$0;sep=","}')"  --ignore-not-found -n $ns -o=custom-columns=KIND:.kind,NAME:.metadata.name --sort-by='kind' | grep -v PackageManifest | grep -v Event
     done