Fix subscription naming issue

Signed-off-by: Shylesh Kumar Mohan <[email protected]>
red-hat-storage · Oct 8, 2024 · 4455e2a · 4455e2a
1 parent b36ccf8
commit 4455e2a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py
@@ -1704,9 +1704,11 @@
 DR_HUB_OPERATOR_SUBSCRIPTION = (
     "odr-hub-operator-stable-PLACEHOLDER-redhat-operators-openshift-marketplace"
 )
-DR_CLUSTER_OPERATOR_SUBSCRIPTION = (
-    "odr-cluster-operator-stable-PLACEHOLDER-redhat-operators-openshift-marketplace"
-)
+DR_HUB_OPERATOR_SUBSCRIPTION_LABEL = "operators.coreos.com/odr-hub-operator.openshift-operators"
+#DR_CLUSTER_OPERATOR_SUBSCRIPTION = (
+#    "odr-cluster-operator-stable-PLACEHOLDER-redhat-operators-openshift-marketplace"
+#)
+DR_CLUSTER_OPERATOR_SUBSCRIPTION = "ramen-dr-cluster-subscription"
 
 # UI Deployment constants
 HTPASSWD_SECRET_NAME = "htpass-secret"

diff --git a/ocs_ci/ocs/dr_upgrade.py b/ocs_ci/ocs/dr_upgrade.py
@@ -52,6 +52,7 @@ def __init__(
         self.subscription_name = None
         self.pre_upgrade_data = dict()
         self.post_upgrade_data = dict()
+        self.namespace = namespace
         # Upgraded phases [pre_upgrade, post_upgrade]
         self.upgrade_phase = "pre_upgrade"
         if resource_name:
@@ -88,7 +89,7 @@ def run_upgrade(self):
         # we need to update subscriptions individually for DR operator as we don't want
         # to upgrade ODF at the time of DR operator (MCO, DR Hub), ODF would follow the upgrade
         # of DR operators
-        self.update_subscription(self.channel, self.subscription_name)
+        self.update_subscription(self.channel, self.subscription_name, self.namespace )
         # In the case upgrade is not from 4.8 to 4.9 and we have manual approval strategy
         # we need to wait and approve install plan, otherwise it's approved in the
         # subscribe_ocs method.
@@ -115,22 +116,17 @@ def run_upgrade(self):
             self.upgrade_version,
             self.resource_name,
         )
-        verify_image_versions(
-            old_image,
-            self.get_parsed_versions()[1],
-            self.version_before_upgrade,
-        )
 
-    def update_subscription(self, channel, subscription_name):
+    def update_subscription(self, channel, subscription_name, namespace=constants.OPENSHIFT_OPERATORS):
         subscription = OCP(
             resource_name=subscription_name,
             kind="subscription.operators.coreos.com",
             # namespace could be different on managed clusters
             # TODO: Handle different namespaces
-            namespace=constants.OPENSHIFT_OPERATORS,
+            namespace=namespace,
         )
         current_source = subscription.data["spec"]["source"]
-        log.info(f"Current MCO source: {current_source}")
+        log.info(f"Current source: {current_source}")
         mco_source = (
             current_source
             if self.upgrade_in_current_source
@@ -242,9 +238,24 @@ class DRHubUpgrade(DRUpgrade):
     def __init__(self):
         super().__init__(resource_name=defaults.DR_HUB_OPERATOR_NAME)
         self.operator_name = defaults.DR_HUB_OPERATOR_NAME
-        self.subscription_name = constants.DR_HUB_OPERATOR_SUBSCRIPTION.replace(
-            "PLACEHOLDER", config.ENV_DATA["ocs_version"]
-        )
+        #self.subscription_name = constants.DR_HUB_OPERATOR_SUBSCRIPTION.replace(
+        #    "PLACEHOLDER", config.ENV_DATA["ocs_version"]
+        #)
+        for sample in TimeoutSampler(
+            300, 10, OCP, kind=constants.SUBSCRIPTION_COREOS, namespace=self.namespace
+        ):
+            subscriptions = sample.get().get("items", [])
+            for subscription in subscriptions:
+                found_subscription_name = subscription.get("metadata", {}).get(
+                    "name", ""
+                )
+                if defaults.DR_HUB_OPERATOR_NAME in found_subscription_name:
+                    log.info(f"Subscription found: {found_subscription_name}")
+                    self.subscription_name = found_subscription_name
+            break
+        if not self.subscription_name:
+            log.error(f"Couldn't find the subscription for {defaults.DR_HUB_OPERATOR_NAME}")
+
         self.pod_name_pattern = "ramen-hub-operator"
 
     def run_upgrade(self):
@@ -275,9 +286,10 @@ def __init__(self):
             namespace=constants.OPENSHIFT_DR_SYSTEM_NAMESPACE,
         )
         self.operator_name = defaults.DR_CLUSTER_OPERATOR_NAME
-        self.subscription_name = constants.DR_CLUSTER_OPERATOR_SUBSCRIPTION.replace(
-            "PLACEHOLDER", config.ENV_DATA["ocs_version"]
-        )
+        #self.subscription_name = constants.DR_CLUSTER_OPERATOR_SUBSCRIPTION.replace(
+        #    "PLACEHOLDER", config.ENV_DATA["ocs_version"]
+        #)
+        self.subscription_name = constants.DR_CLUSTER_OPERATOR_SUBSCRIPTION 
         self.pod_name_pattern = "ramen-dr-cluster-operator"
 
     def run_upgrade(self):

diff --git a/tests/functional/upgrade/test_upgrade.py b/tests/functional/upgrade/test_upgrade.py
@@ -23,6 +23,7 @@
     MultiClusterOrchestratorUpgrade,
     DRHubUpgrade,
 )
+from ocs_ci.ocs import constants
 from ocs_ci.utility.reporting import get_polarion_id
 from ocs_ci.utility.utils import is_z_stream_upgrade