improve checking modprob netfilter #6427
Merged
Conversation
This file contains 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
k8s-ci-robot
added
the
cncf-cla: yes
medyagh
changed the title
k8s-ci-robot
added
the
size/S
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: medyagh 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 |
k8s-ci-robot
added
the
approved
medyagh
changed the title
medyagh
changed the title
|
/ok-to-test |
k8s-ci-robot
added
the
ok-to-test
tstromberg
suggested changes
Jan 29, 2020
pkg/minikube/cruntime/cruntime.go
Outdated
| glog.Infof("couldn't verify netfilter by %q which might be okay. output=%q error=%v", rr.Command(), rr.Output(), err) | ||
| c = exec.Command("sudo", "modprobe", "br_netfilter") | ||
| if rr, err := cr.RunCmd(c); err != nil { | ||
| return errors.Wrapf(err, "br_netfilter. output: %s", rr.Output()) |
pkg/minikube/cruntime/cruntime.go
Outdated
| return errors.Wrap(err, "br_netfilter") | ||
| c := exec.Command("sudo", "sysctl", "net.netfilter.nf_conntrack_count") | ||
| if rr, err := cr.RunCmd(c); err != nil { | ||
| glog.Infof("couldn't verify netfilter by %q which might be okay. output=%q error=%v", rr.Command(), rr.Output(), err) |
There was a problem hiding this comment.
I believe rr.Output() here is redundant: RunCmd errors already include stdout/stderr, or at least non-kic drivers do. Can we fix kic's RunCmd to be consistent instead?
There was a problem hiding this comment.
I just noticed we have same thing in kic as well.
fmt.Errorf("%s: %v\nstdout:\n%s\nstderr:\n%s", rr.Command(), err, rr.Stdout.String(), rr.Stderr.String())```
Codecov Report
@@ Coverage Diff @@
## master #6427 +/- ##
==========================================
- Coverage 37.46% 37.44% -0.02%
==========================================
Files 128 128
Lines 8646 8649 +3
==========================================
Hits 3239 3239
- Misses 4988 4991 +3
Partials 419 419
|
|
Error: running mkcmp: exit status 1 |
medyagh
changed the title
tstromberg
approved these changes
Jan 29, 2020
|
/ok-to-test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes this #5900 (none)
and helps with #6404 (docker on cloud shell)
based on suggestion by @tstromberg here #5900 (comment)