Mcd startup cleanup further #866
Merged
Conversation
This file contains hidden or 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
openshift-ci-robot
added
size/L
cgwalters
commented
Jun 19, 2019
runcom
reviewed
Jun 19, 2019
cgwalters
added a commit
to cgwalters/machine-config-operator
that referenced
this pull request
Jun 19, 2019
We know RHCOS has it being RHEL8. Split out of openshift#866
This replaces the ad-hoc method of passing in dummy data or no-op functions into the daemon. In this mode we detect if we're running as non-root and do nothing. Currently this just replaces the loading of `bootID` (to help devs on MacOS) and the SSH key mocking. This way the Daemon creation interface is cleaner.
Build on the previous `mock` state to just use `dummy` in that mode.
This way we cleanly do prep work gathering data and then just
`return &Daemon {... }`. Previously it was rather weird how
`dn.isLoggingToJournalSupported` was a method used on effectively
a partially constructed daemon. We only called that once and
then cached the result, so just inline it into the ctor.
We don't want to do this in once from; we may be responsible for upgrading the kubelet itself, it many not be running, etc.
More centralization of init. The fakeWriter was unnecessary AFAICS because we already pass a fake kube client in and the writer uses the daemon's client.
This code was introduced in 522cddb but nothing used it, and most notably the `NewClusterDrivenDaemon` path always passed `nil` for it.
This finally removes a lot of the remaining duplication between the cluster vs oncefrom paths. Now you call `New` to get a daemon, and can optionally turn it into a cluster driven one.
cgwalters
force-pushed
the
mcd-startup-cleanup-further
branch
from
e92c63c to
ccde275
Compare
Member
Author
|
Rebased 🏄♂️ |
Member
|
/refresh |
Member
|
/retest |
Member
|
/approve |
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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
More patches like #862