-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
node: skip docker ping check when using fake docker #17979
Conversation
@deads2k we need to be able to run the kubelet with a fake docker client (which is doable when you set |
47fb030
to
44ba523
Compare
Just the one failure now:
|
} | ||
|
||
if !isFakeDocker { | ||
if err := dockerClient.Ping(); err != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not adding the Ping
method to the FakeDockerClient
rather than introducing this hack?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'd still need to know whether we're using it so we can match the cgroupdriver
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will open a PR upstream
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks.
I'm ok with it. It's fairly likely to slip during a rebase (type assertions break all the time), so you may want a test. |
As soon as this is passing our containerized tests it can't slip in a rebase since it will be required to run integration tests in CI |
44ba523
to
ca5ca9c
Compare
@csrwng if that's the case, consider yourself on notice for rebase help if this borks badly :) /lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: csrwng, deads2k The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
This is needed to unblock integration tests. I will create a follow up issue to clean it up |
/retest |
Automatic merge from submit-queue (batch tested with PRs 17856, 16934, 17979, 17993, 18001). |
When using fake docker