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.

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

Don't verify nf_conntrack for br_netfilter #8598

Merged
merged 1 commit into from
Jun 30, 2020

Conversation

afbjorklund
Copy link
Collaborator

We need to make sure that the br_netfilter kernel module
has been loaded, when using non-Docker container runtimes.

But the code was verifying the nf_conntrack kernel module
instead, so it could still cause the "not loaded" error.

[ERROR FileContent--proc-sys-net-bridge-bridge-nf-call-iptables]

We need to make sure that the br_netfilter kernel module
has been loaded, when using non-Docker container runtimes.

But the code was verifying the nf_conntrack kernel module
instead, so it could still cause the "not loaded" error.

[ERROR FileContent--proc-sys-net-bridge-bridge-nf-call-iptables]
@afbjorklund afbjorklund requested a review from medyagh June 29, 2020 20:33
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 29, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2020
@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Jun 29, 2020

It was added by mistake in PR #6427 when trying to fix broken builtins (#5900) for a custom kernel with some files deleted.

As long as /lib/modules/$(uname -r)/modules.builtin is available, then "modprobe" will work fine on builtin modules.

@medyagh
Copy link
Member

medyagh commented Jun 29, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jun 29, 2020
@minikube-pr-bot
Copy link

kvm2 Driver
docker Driver

@medyagh
Copy link
Member

medyagh commented Jun 30, 2020

/retest-this-please

@medyagh
Copy link
Member

medyagh commented Jun 30, 2020

None test time out is related to #8601

@medyagh medyagh merged commit 2b5254c into kubernetes:master Jun 30, 2020
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants