Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c0bbaea0
Commit
c0bbaea0
authored
Feb 01, 2022
by
Manuel Buil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the iptables rules from ipmasq flannel
Signed-off-by:
Manuel Buil
<
mbuil@suse.com
>
parent
47c3ce84
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
go.mod
go.mod
+4
-4
go.sum
go.sum
+0
-0
install.sh
install.sh
+2
-2
install.sh
package/rpm/install.sh
+2
-2
No files found.
go.mod
View file @
c0bbaea0
...
...
@@ -33,7 +33,7 @@ replace (
go.etcd.io/etcd => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20220113195313-6c2233a709e8 //k3s-release-3.4
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net => golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
golang.org/x/sys => golang.org/x/sys v0.0.0-20210
225134936-a50acf3fe073
golang.org/x/sys => golang.org/x/sys v0.0.0-20210
831042530-f4d43177bf5e
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
google.golang.org/grpc => google.golang.org/grpc v1.27.1
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2
...
...
@@ -79,7 +79,7 @@ require (
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/docker/docker v20.10.10+incompatible
github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83
github.com/flannel-io/flannel v0.1
5.1
github.com/flannel-io/flannel v0.1
6.3
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-sql-driver/mysql v1.6.0
github.com/golangplus/testing v1.0.0 // indirect
...
...
@@ -115,9 +115,9 @@ require (
github.com/tchap/go-patricia v2.3.0+incompatible // indirect
github.com/urfave/cli v1.22.4
go.etcd.io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea
golang.org/x/crypto v0.0.0-2021
0322153248-0c34fe9e7dc2
golang.org/x/crypto v0.0.0-2021
1202192323-5770296d904e
golang.org/x/net v0.0.0-20211209124913-491a49abca63
golang.org/x/sys v0.0.0-20211
004093028-2c5d950f24ef
golang.org/x/sys v0.0.0-20211
216021012-1d35b9e2eb4e
google.golang.org/grpc v1.41.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.9
...
...
go.sum
View file @
c0bbaea0
This diff is collapsed.
Click to expand it.
install.sh
View file @
c0bbaea0
...
...
@@ -635,8 +635,8 @@ ip link delete cni0
ip link delete flannel.1
ip link delete flannel-v6.1
rm -rf /var/lib/cni/
iptables-save | grep -v KUBE- | grep -v CNI- | iptables-restore
ip6tables-save | grep -v KUBE- | grep -v CNI- | ip6tables-restore
iptables-save | grep -v KUBE- | grep -v CNI- |
grep -v flannel |
iptables-restore
ip6tables-save | grep -v KUBE- | grep -v CNI- |
grep -v flannel |
ip6tables-restore
EOF
$SUDO
chmod
755
${
KILLALL_K3S_SH
}
$SUDO
chown
root:root
${
KILLALL_K3S_SH
}
...
...
package/rpm/install.sh
View file @
c0bbaea0
...
...
@@ -563,8 +563,8 @@ ip link delete cni0
ip link delete flannel.1
ip link delete flannel-v6.1
rm -rf /var/lib/cni/
iptables-save | grep -v KUBE- | grep -v CNI- | iptables-restore
ip6tables-save | grep -v KUBE- | grep -v CNI- | ip6tables-restore
iptables-save | grep -v KUBE- | grep -v CNI- |
grep -v flannel |
iptables-restore
ip6tables-save | grep -v KUBE- | grep -v CNI- |
grep -v flannel |
ip6tables-restore
EOF
$SUDO
chmod
755
${
KILLALL_K3S_SH
}
$SUDO
chown
root:root
${
KILLALL_K3S_SH
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment