-
Notifications
You must be signed in to change notification settings - Fork 416
Switch to iptables-wrappers #73641
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
Merged
Merged
Switch to iptables-wrappers #73641
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3fa8c3c
Switch to iptables-wrappers
f4bc37b
Sort deps for yam
78e5048
k8s works now; ip6tables is in iptables-wrappers
3981ab1
ip6tables is in iptables-wrappers
94bb793
iptables-xtables-privileged doesn't need iptables-wrappers
bf81ba4
rancher tests work with qemu as the runner
01c0eaf
Remove test that doesn't work in docker/CI
ee3d447
Missed epoch bump somehow
2db8520
Revert rancher
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,16 @@ | ||
| package: | ||
| name: flannel | ||
| version: "0.27.4" | ||
| epoch: 4 # GHSA-j5w8-q4qc-rx2x | ||
| epoch: 5 | ||
| description: flannel is a network fabric for containers, designed for Kubernetes | ||
| copyright: | ||
| - license: Apache-2.0 | ||
| dependencies: | ||
| runtime: | ||
| - ca-certificates | ||
| - coreutils | ||
| - ip6tables | ||
| - iproute2 | ||
| - iptables | ||
| - iptables-wrappers | ||
| - nftables | ||
| - strongswan | ||
| - wireguard-tools | ||
|
|
@@ -36,8 +35,7 @@ pipeline: | |
| deps: |- | ||
| golang.org/x/[email protected] | ||
|
|
||
| - if: ${{build.arch}} == 'aarch64' | ||
| uses: patch | ||
| - uses: patch | ||
| with: | ||
| patches: disableBrNetfilterCheck.patch | ||
|
|
||
|
|
@@ -74,6 +72,7 @@ test: | |
| - etcd | ||
| - jq | ||
| - iproute2 | ||
| - iptables-wrappers | ||
| pipeline: | ||
| - name: "Check flanneld version" | ||
| runs: | | ||
|
|
@@ -122,13 +121,8 @@ test: | |
| sleep 3 | ||
|
|
||
| # Run flanneld in background | ||
| if [ "${{build.arch}}" = "aarch64" ]; then | ||
| flanneld --etcd-endpoints=$ETCD_ENDPOINTS --iface=$IFACE --iptables-forward-rules=false --disable-br-netfilter-check > /tmp/flannel.log 2>&1 & | ||
| FLANNEL_PID=$! | ||
| else | ||
| flanneld --etcd-endpoints=$ETCD_ENDPOINTS --iface=$IFACE --iptables-forward-rules=false > /tmp/flannel.log 2>&1 & | ||
| FLANNEL_PID=$! | ||
| fi | ||
| flanneld --etcd-endpoints=$ETCD_ENDPOINTS --iface=$IFACE --iptables-forward-rules=false --disable-br-netfilter-check > /tmp/flannel.log 2>&1 & | ||
| FLANNEL_PID=$! | ||
|
|
||
| # Save PID to environment file | ||
| echo "export FLANNEL_PID=$FLANNEL_PID" >> /tmp/env.sh | ||
|
|
||
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
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.