[mce-2.6] machinepool: sort ownedLabels, ownedTaints

[openshift-cherrypick-robot]

This is an automated cherry-pick of #2313

/assign 2uasimojo

/cherrypick mce-2.5 mce-2.4

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.73%. Comparing base (cd191be) to head (e243c43).
Report is 12 commits behind head on mce-2.6.

Additional details and impacted files

@@             Coverage Diff             @@
##           mce-2.6    #2314      +/-   ##
===========================================
+ Coverage    58.54%   58.73%   +0.18%     
===========================================
  Files          182      182              
  Lines        25830    25986     +156     
===========================================
+ Hits         15123    15262     +139     
- Misses        9431     9445      +14     
- Partials      1276     1279       +3     

Files	Coverage Δ
...g/controller/machinepool/machinepool_controller.go	54.88% <100.00%> (+0.33%)	⬆️

... and 2 files with indirect coverage changes

[2uasimojo]

/retest

[2uasimojo]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [2uasimojo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[openshift-cherrypick-robot]

@openshift-cherrypick-robot: #2314 failed to apply on top of branch "mce-2.5":

Applying: machinepool: sort ownedLabels, ownedTaints
Using index info to reconstruct a base tree...
M	pkg/controller/machinepool/machinepool_controller.go
M	pkg/controller/machinepool/machinepool_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/machinepool/machinepool_controller_test.go
CONFLICT (content): Merge conflict in pkg/controller/machinepool/machinepool_controller_test.go
Auto-merging pkg/controller/machinepool/machinepool_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 machinepool: sort ownedLabels, ownedTaints
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

This is an automated cherry-pick of #2313

/assign 2uasimojo

/cherrypick mce-2.5 mce-2.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[2uasimojo]

mce-2.5: #2386