From 87c7ea81f0ac689336599ced708356c98fbe6cf6 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Mon, 31 Oct 2022 11:02:12 +0100 Subject: [PATCH] Updated flannel version to 0.20.1 Signed-off-by: Roberto Bonafiglia --- go.mod | 6 +++--- go.sum | 8 ++++---- install.sh | 4 ++-- package/rpm/install.sh | 4 ++-- pkg/agent/flannel/flannel.go | 4 ++++ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 41b22caab9..60fe50840a 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/docker/docker v20.10.17+incompatible github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83 - github.com/flannel-io/flannel v0.19.2 + github.com/flannel-io/flannel v0.20.1 github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/go-sql-driver/mysql v1.6.0 github.com/google/cadvisor v0.45.0 @@ -117,7 +117,7 @@ require ( go.etcd.io/etcd/etcdutl/v3 v3.5.4 go.etcd.io/etcd/server/v3 v3.5.4 go.uber.org/zap v1.19.0 - golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa + golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 golang.org/x/net v0.0.0-20221004154528-8021a29435af golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 golang.org/x/sys v0.0.0-20221010170243-090e33056c14 @@ -364,7 +364,7 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.8 // indirect + golang.org/x/text v0.4.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/tools v0.1.12 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect diff --git a/go.sum b/go.sum index 90d0416119..249a39ad71 100644 --- a/go.sum +++ b/go.sum @@ -315,8 +315,8 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flannel-io/flannel v0.19.2 h1:oB20MigNwcemlr7MmJs+TbPQ6ggO7PygJR1hoqXYxJw= -github.com/flannel-io/flannel v0.19.2/go.mod h1:iAS5jRrwG+dUuGBhBIPZ8K6GvUZ3bodZfRjESOH9co0= +github.com/flannel-io/flannel v0.20.1 h1:3P3pdkhgcb+HAF9qNBV7gSt21IIQpyMJh7lVDSYIBls= +github.com/flannel-io/flannel v0.20.1/go.mod h1:A23fmdRQyN4i6Gs5UzvVTlj8kcswPYIqisLhgUkhnxk= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -1261,8 +1261,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/install.sh b/install.sh index 64cadcd5bf..4a6c2f3456 100755 --- a/install.sh +++ b/install.sh @@ -681,8 +681,8 @@ ip link delete kube-ipvs0 ip link delete flannel-wg ip link delete flannel-wg-v6 rm -rf /var/lib/cni/ -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 +iptables-save | grep -v KUBE- | grep -v CNI- | grep -iv flannel | iptables-restore +ip6tables-save | grep -v KUBE- | grep -v CNI- | grep -iv flannel | ip6tables-restore EOF $SUDO chmod 755 ${KILLALL_K3S_SH} $SUDO chown root:root ${KILLALL_K3S_SH} diff --git a/package/rpm/install.sh b/package/rpm/install.sh index cdbd5f48b4..cc713c5463 100755 --- a/package/rpm/install.sh +++ b/package/rpm/install.sh @@ -570,8 +570,8 @@ ip link delete flannel-wg ip link delete flannel-wg-v6 ip link delete kube-ipvs0 rm -rf /var/lib/cni/ -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 +iptables-save | grep -v KUBE- | grep -v CNI- | grep -iv flannel | iptables-restore +ip6tables-save | grep -v KUBE- | grep -v CNI- | grep -iv flannel | ip6tables-restore EOF $SUDO chmod 755 ${KILLALL_K3S_SH} $SUDO chown root:root ${KILLALL_K3S_SH} diff --git a/pkg/agent/flannel/flannel.go b/pkg/agent/flannel/flannel.go index 27173dcc97..a961b9093c 100644 --- a/pkg/agent/flannel/flannel.go +++ b/pkg/agent/flannel/flannel.go @@ -76,12 +76,16 @@ func flannel(ctx context.Context, flannelIface *net.Interface, flannelConf, kube } if netMode == (ipv4+ipv6) || netMode == ipv4 { + network.CreateIP4Chain("nat", "FLANNEL-POSTRTG") + network.CreateIP4Chain("filter", "FLANNEL-FWD") go network.SetupAndEnsureIP4Tables(network.MasqRules(config.Network, bn.Lease()), 60) go network.SetupAndEnsureIP4Tables(network.ForwardRules(config.Network.String()), 50) } if flannelIPv6Masq && config.IPv6Network.String() != emptyIPv6Network { logrus.Debugf("Creating IPv6 masquerading iptables rules for %s network", config.IPv6Network.String()) + network.CreateIP6Chain("nat", "FLANNEL-POSTRTG") + network.CreateIP6Chain("filter", "FLANNEL-FWD") go network.SetupAndEnsureIP6Tables(network.MasqIP6Rules(config.IPv6Network, bn.Lease()), 60) go network.SetupAndEnsureIP6Tables(network.ForwardRules(config.IPv6Network.String()), 50) }