Skip to content

Conversation

@runcom
Copy link
Member

@runcom runcom commented Mar 15, 2019

Signed-off-by: Antonio Murdaca [email protected]

- What I did

This PR is a follow up from #548 which accounts for the change in behavior that we introduced with that. Most notably:

  • we are never in a permanent Degraded state anymore, we flip Working and Degraded but the logic for determining the updated/unavailable machines rely only on current/desired annotation. I'm going to fix that and remove Degraded
  • progressing on applying a machineconfig is currently broken because of the above, so max unavailable isn't respected
  • with pkg/daemon: rewrite the MCD as a controller #548, we can now delete a bad machineconfig which is erroring out in a loop, and just reapply the old one which is going to just stabilize the machine again
  • probably something else I'm still not aware of but I'm actively testing

This PR includes #552 as well
so, close #552

- How to verify it

I'll add e2e(s) + the CI

- Description for the changelog

@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 Mar 15, 2019
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 15, 2019
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 15, 2019
@runcom runcom force-pushed the fix-mcd branch 4 times, most recently from 32420a9 to 8a44f15 Compare March 15, 2019 23:16
@runcom runcom changed the title WIP: Fix MCD status reporting, retry loop and max unavailable progress Fix MCD status reporting, retry loop and max unavailable progress Mar 17, 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 Mar 17, 2019
@runcom
Copy link
Member Author

runcom commented Mar 17, 2019

This is good to be reviewed now and there's a self explanatory e2e test for rolling back a bad machineconfig. Just a note, this PR is a required follow up to the MCD rewrite as a controller.

runcom added 2 commits March 17, 2019 13:14
instead of polling for that long...

Signed-off-by: Antonio Murdaca <[email protected]>
Since we're not just going to try again and again to apply a
machineconfig, it makes little sense to have a global Degraded count in
the MCP. Instead, base the logic on current vs desired config + state
Done. This patch does that changing the logic but leaving most of it
intact (I'd say the logic is now more robust and accounts for the new
MCD as a controller model).
Other than the above, with this patch you can finally, create a bad
machineconfig and watch the daemon keep trying reconciling but failing
(we can add the Unreconcilable annotation as a follow up indeed now),
and just delete the bad machineconfig and everything goes back to the
working, new, current state.
I've also added e2e to cover most of what I've done here (for what is
possible).

Signed-off-by: Antonio Murdaca <[email protected]>
@runcom
Copy link
Member Author

runcom commented Mar 17, 2019

not related and known failure

/retest

@runcom
Copy link
Member Author

runcom commented Mar 17, 2019

openshift-sdn failing

/retest

@runcom
Copy link
Member Author

runcom commented Mar 17, 2019

green :)

@runcom
Copy link
Member Author

runcom commented Mar 17, 2019

@cgwalters
Copy link
Member

Nice!

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, runcom

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:

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

@openshift-merge-robot openshift-merge-robot merged commit 9012811 into openshift:master Mar 17, 2019
@runcom runcom deleted the fix-mcd branch March 17, 2019 19:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants