UPSTREAM: <carry>: openshift: Always consider all machines to have node role #31
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
As part of minimizing the number of machine labels needed by actuators to make decisions, we want to remove
machine.openshift.io/cluster-api-machine-rolemachine label, which is in Azure actuator used to distinguishes between node and control plane machine. Given openshift actuators do not create control plane machines, it's safe to assume all machines are node machines for now.It's impossible to remove dependency on
machine.openshift.io/cluster-api-machine-rolemachine label without removing a bunch of tests relying on control plane machine role. Thus, instead of removing the label, just fallback to node role by default. Thus, eliminating the need to setmachine.openshift.io/cluster-api-machine-rolemachine label.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Special notes for your reviewer:
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
Release note: