Skip to content

Commit

Permalink
Merge pull request #9324 from petr-balogh/revet-of-wa-for-applying-re…
Browse files Browse the repository at this point in the history
…gion-label-to-master-nodes-release-4.14

Revert "Only apply region node to worker nodes for noobaa IBM Cloud C…
  • Loading branch information
clacroix12 authored Feb 13, 2024
2 parents 3806196 + 7549053 commit 3fb4c5d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions ocs_ci/utility/ibmcloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

0 comments on commit 3fb4c5d

Please sign in to comment.