NO-ISSUE: Fix catalogsource when upgrading operator (#2724)

This restructures the existing code and fixes the issue which happens during the installation of the operator in the upgrade scenario. The issue is `catalogsources.operators.coreos.com "assisted-service-operator-catalog not found"` which got introduced during operator upgrade job improvements changes.

Author: pawanpinjarkar

deploy/operator/common.sh

@@ -21,6 +21,7 @@ export ASSISTED_NAMESPACE="${ASSISTED_NAMESPACE:-assisted-installer}"
 export SPOKE_NAMESPACE="${SPOKE_NAMESPACE:-assisted-spoke-cluster}"
 export HIVE_NAMESPACE="${HIVE_NAMESPACE:-hive}"
 export ASSISTED_UPGRADE_OPERATOR="${ASSISTED_UPGRADE_OPERATOR:-false}"
+export ASSISTED_SERVICE_OPERATOR_CATALOG="assisted-service-operator-catalog"
 
 ############
 # Versions #

deploy/operator/gather.sh

@@ -17,7 +17,7 @@ function gather_hive_data() {
 }
 
 function gather_olm_data() {
-  oc get catalogsource assisted-service-operator-catalog -n openshift-marketplace -o yaml > ${LOGS_DEST}/assisted-service-operator-catalog.log
+  oc get catalogsource "${ASSISTED_SERVICE_OPERATOR_CATALOG}" -n openshift-marketplace -o yaml > ${LOGS_DEST}/${ASSISTED_SERVICE_OPERATOR_CATALOG}.log
   oc get subscription assisted-service-operator -n "${ASSISTED_NAMESPACE}" -o yaml > ${LOGS_DEST}/assisted-service-operator-subscription.log
   oc get installplan -n "${ASSISTED_NAMESPACE}" -o yaml  > ${LOGS_DEST}/oc_install_plan.log
 }

deploy/operator/setup_assisted_operator.sh

@@ -89,7 +89,23 @@ EOF
 
 function install_from_catalog_source() {
   catalog_source_name="${1}"
+  if [ "${ASSISTED_UPGRADE_OPERATOR}" = "true" ]; then
+   catalog_source=${ASSISTED_SERVICE_OPERATOR_CATALOG}
+  else
+    catalog_source=${catalog_source_name}
+  fi
   tee << EOCR >(oc apply -f -)
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: ${catalog_source}
+  namespace: openshift-marketplace
+spec:
+  sourceType: grpc
+  image: ${INDEX_IMAGE}
+  displayName: Assisted Test Registry
+  publisher: Assisted Developer
+---
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -229,19 +245,7 @@ function from_index_image() {
         "${INDEX_IMAGE}" "${LOCAL_REGISTRY}" "${AUTHFILE}" "${catalog_source_name}"
     mirror_rhcos
   else
-    catalog_source_name="assisted-service-operator-catalog"
-    tee << EOCR >(oc apply -f -)
-apiVersion: operators.coreos.com/v1alpha1
-kind: CatalogSource
-metadata:
-  name: ${catalog_source_name}
-  namespace: openshift-marketplace
-spec:
-  sourceType: grpc
-  image: ${INDEX_IMAGE}
-  displayName: Assisted Test Registry
-  publisher: Assisted Developer
-EOCR
+    catalog_source_name=${ASSISTED_SERVICE_OPERATOR_CATALOG}
   fi
 
   install_from_catalog_source "${catalog_source_name}"