From 75490536d9a2791737512d278d8be0f7c9fc76fd Mon Sep 17 00:00:00 2001 From: Petr Balogh Date: Tue, 13 Feb 2024 16:29:36 +0100 Subject: [PATCH] Revert "Only apply region node to worker nodes for noobaa IBM Cloud COS backingstore (#9147)" This reverts commit aa2cbc6fbbd2b6e8c5bac90e238ee8c335ef10d2. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2255557#c10 Is not yet backported to 4.14 Once it's backported we have opened W/A issue to revert this back: https://github.com/red-hat-storage/ocs-ci/issues/9327 Signed-off-by: Petr Balogh --- ocs_ci/utility/ibmcloud.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ocs_ci/utility/ibmcloud.py b/ocs_ci/utility/ibmcloud.py index 62a2e5f7685..82bc1b54ec8 100644 --- a/ocs_ci/utility/ibmcloud.py +++ b/ocs_ci/utility/ibmcloud.py @@ -522,12 +522,14 @@ def delete_volume_id(self, volume): def label_nodes_region(): """ - Apply the region label to the worker nodes. + Apply the region label to the worker and master nodes. Necessary for IBM COS-backed backingstore support. """ - logger.info("Applying region label to worker nodes") + logger.info("Applying region label to worker and master nodes") region = config.ENV_DATA.get("region") worker_nodes = get_nodes(node_type=constants.WORKER_MACHINE) - for node in worker_nodes: + master_nodes = get_nodes(node_type=constants.MASTER_MACHINE) + all_nodes = worker_nodes + master_nodes + for node in all_nodes: node.add_label(rf"ibm-cloud\.kubernetes\.io/region={region}")