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.

Sign up for GitHub

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

Jump to bottom

Decrement MD allowed count only when machine has not be previously accounted #358

Merged
merged 1 commit into from
Jul 23, 2019
Merged

Decrement MD allowed count only when machine has not be previously accounted #358

merged 1 commit into from
Jul 23, 2019

Conversation

ingvagabund
Copy link
Member

@ingvagabund ingvagabund commented Jul 22, 2019 •
edited
Loading

SSIA

TODO:

  • unit test call to RetryDecrementMachineDisruptionsAllowed

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 22, 2019
@ingvagabund ingvagabund mentioned this pull request Jul 22, 2019
Merged
@ingvagabund ingvagabund changed the title Decrement MD allowed count only when machine has not be previously accounted WIP: Decrement MD allowed count only when machine has not be previously accounted Jul 22, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 22, 2019
@bison
Copy link
Contributor

bison commented Jul 22, 2019

This looks good, though I think we also need to talk about how buildDisruptedMachineMap() works. Doesn't seem to really fit now that there are remediation strategies other than delete.

@ingvagabund ingvagabund force-pushed the decrement-only-if-machine-is-not-present branch from eb4990d to 6449775 Compare July 22, 2019 11:28
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 22, 2019
@ingvagabund ingvagabund force-pushed the decrement-only-if-machine-is-not-present branch 3 times, most recently from 7316191 to f708581 Compare July 22, 2019 11:33
@ingvagabund ingvagabund changed the title WIP: Decrement MD allowed count only when machine has not be previously accounted Decrement MD allowed count only when machine has not be previously accounted Jul 22, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 22, 2019
@ingvagabund ingvagabund force-pushed the decrement-only-if-machine-is-not-present branch from f708581 to 40bd359 Compare July 22, 2019 11:38
@cynepco3hahue
Copy link
Contributor

cynepco3hahue commented Jul 22, 2019 •
edited
Loading

This looks good, though I think we also need to talk about how buildDisruptedMachineMap() works. Doesn't seem to really fit now that there are remediation strategies other than delete.

One who is adding machines to the DisruptedMachines is MHC controller once the remediation was initiated, so the logic will be the same, but we need to rename all delete words to remediate.

@cynepco3hahue
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2019
@ingvagabund
Copy link
Member Author

One who adds machines to the DisruptedMachines is MHC controller once the remediation was initiated, so the logic will be the same, but we need to rename all delete word to remediate.

Renaming is not sufficient. buildDisruptedMachineMap hardcodes DeletionTimeout const (set to 2 minutes) and assumes all re-mediated machines are to be deleted eventually.

@cynepco3hahue
Copy link
Contributor

Renaming is not sufficient. buildDisruptedMachineMap hardcodes DeletionTimeout const (set to 2 minutes) and assumes all re-mediated machines are to be deleted eventually.

True 😟 If we will move to work with MachineRemediation CR, we can poll the state of the remediation process.

@ingvagabund
Copy link
Member Author

/retest

@enxebre
Copy link
Member

enxebre commented Jul 23, 2019

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2019
@ingvagabund
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 0c0a066 into openshift:master Jul 23, 2019
cynepco3hahue pushed a commit to kubevirt/machine-remediation that referenced this pull request Jul 24, 2019
Cherry-pick openshift/machine-api-operator#358
53cae49
cynepco3hahue pushed a commit to kubevirt/machine-remediation that referenced this pull request Jul 24, 2019
Cherry-pick openshift/machine-api-operator#358
b48dc58
@ingvagabund ingvagabund deleted the decrement-only-if-machine-is-not-present branch July 29, 2019 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bison bison Awaiting requested review from bison

@frobware frobware Awaiting requested review from frobware

Assignees

@cynepco3hahue cynepco3hahue

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ingvagabund @bison @cynepco3hahue @enxebre @openshift-ci-robot @openshift-merge-robot