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

Re-add net.bridge settings for flannel #13564

Merged
merged 1 commit into from
Apr 28, 2022

Conversation

rifelpet
Copy link
Member

@rifelpet rifelpet commented Apr 27, 2022

This was originally only set on Centos 7 / RHEL 7 but we're experiencing similar issues on Amazon Linux 2

backstory:

This PR's lengthy discussion to remove support for flannel/vxlan after the same issues were causing grid failures for Centos 7 / RHEL 7: #8614

These sysctl settings were added for centos/rhel which supposedly fixed our grid jobs: #8381

These settings were removed when we dropped support for those distros: https://github.com/kubernetes/kops/pull/12882/files#diff-5326919ae93590b94b210fb2373f8374d5567d146aadaf815ca6a1f7b68179dd

Hoping this fixes these grid jobs: https://testgrid.k8s.io/kops-grid#kops-grid-flannel-amzn2-k23-docker

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 27, 2022
@rifelpet
Copy link
Member Author

we don't have a flannel / AL2 presubmit job so we wont know if this fixes things until post-merge

nodeup/pkg/model/sysctls.go Outdated Show resolved Hide resolved
This was originally only set on Centos 7 / RHEL 7 but we're experiencing similar issues on Amazon Linux 2
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 28, 2022
@k8s-ci-robot k8s-ci-robot merged commit a093f22 into kubernetes:master Apr 28, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Apr 28, 2022
k8s-ci-robot added a commit that referenced this pull request Apr 30, 2022
…64-origin-release-1.23

Automated cherry pick of #13564: Re-add net.bridge settings for flannel
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. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants