Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPSTREAM: <carry>: openshift: drop machine annotation linkage #97

Conversation

frobware
Copy link

This changes the mapping between a node and a machine to rely on the
presence of the ProviderID rather than the "machine" annotation
currently added by the nodelink-controller.

Note: this should not merge until we update the AWS, libvirt and
kubemark actuators - they should ensure that ProviderID is set, if not
already, on the machine object.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 23, 2019
@frobware
Copy link
Author

/hold

Expecting e2e tests to fail as not all actuators are propagating or setting ProviderID.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 23, 2019
@frobware
Copy link
Author

/cc @vikaschoudhary16

@frobware
Copy link
Author

AWS PR for setting ProviderID: openshift/cluster-api-provider-aws#210

@frobware
Copy link
Author

I successfully tested this change against openshift/cluster-api-provider-aws#210. Once that is in a payload I think this is good to merge.

@frobware
Copy link
Author

/retest

@frobware
Copy link
Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 28, 2019
@frobware
Copy link
Author

/cc @ingvagabund @enxebre

This changes the mapping between a node and a machine to rely on the
presence of the ProviderID rather than the "machine" annotation
currently added by the nodelink-controller.

Note: this should not merge until we update the AWS, libvirt and
kubemark actuators - they should ensure that ProviderID is set, if not
already, on the machine object.
@frobware frobware force-pushed the drop-machine-annotation-requirement branch from 32f06b2 to 9a30ba1 Compare May 28, 2019 17:49
@openshift-ci-robot
Copy link

@frobware: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-operator 9a30ba1 link /test e2e-aws-operator

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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/test-infra repository. I understand the commands that are listed here.

@frobware
Copy link
Author

For backwards compatibility we are going to keep the machine annotation but now moving parts of this PR to #99.

@frobware frobware closed this May 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants