UPSTREAM: <carry>: openshift: prioritise search by Provider ID #100
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index machines using machine.Spec.ProviderID.
Finds a machine using provider ID.
openshift-ci-robot
added
the
size/L
This was referenced May 31, 2019
ingvagabund
reviewed
May 31, 2019
cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_controller.go
Show resolved
Hide resolved
cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_controller.go
Show resolved
Hide resolved
…r ID Change findMachineByNodeProviderID() to first match using ProviderID values. If there is no match (because actuator does not set the value on the machine object) then fallback to matchin based on the "machine" annotation from the node object. Update unit tests to reflect new behaviour.
Add new test that verifies that machines without a ProviderID value can still be found if there is a "machine" annotation on the node object.
frobware
force-pushed
the
find-machine-by-node-provider-id-v3
branch
from
6aa254b to
8894561
Compare
|
/approve |
|
/hold Need to also search by ProviderID first in |
openshift-ci-robot
added
the
do-not-merge/hold
frobware
changed the title
frobware
changed the title
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
When mapping from a machine to a node, prioritize the search based on ProviderID, falling back to using machine.Status.NodeRef.Name. This value is populated by the nodelink-controller.
frobware
force-pushed
the
find-machine-by-node-provider-id-v3
branch
from
76599f4 to
47af784
Compare
|
/lgtm |
|
/retest |
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Jun 3, 2019
This is a merge openshift#100
alvaroaleman
pushed a commit
to kubermatic/autoscaler
that referenced
this pull request
Jun 4, 2019
This is a merge openshift#100
alvaroaleman
pushed a commit
to kubermatic/autoscaler
that referenced
this pull request
Jun 4, 2019
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Jun 5, 2019
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Jun 11, 2019
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Jun 12, 2019
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Aug 27, 2019
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Sep 11, 2019
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Feb 4, 2020
This is a merge openshift#100
enxebre
pushed a commit
to enxebre/autoscaler
that referenced
this pull request
Feb 28, 2020
This is a merge openshift#100
frobware
added a commit
to frobware/autoscaler
that referenced
this pull request
Mar 2, 2020
This is a merge openshift#100
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change findMachineByNodeProviderID() to first match using ProviderID value. If there is no match (because actuator does not set the value on the machine object) then fallback to matching based on the "machine" annotation from the node object (should it exist). By falling back to the "machine" annotation on the node object we don't break compatibility with the behaviour in OpenShift 4.1.0.