feat: update Flannel to 0.15.1

https://github.com/flannel-io/flannel/releases/tag/v0.15.1 Also updates CNI plugins to 1.0.1. See: * siderolabs/pkgs#363 * siderolabs/extras#31 Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
siderolabs · Dec 2, 2021 · 99338e5 · 99338e5
1 parent 8370dde
commit 99338e5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -13,8 +13,8 @@ NAME = Talos
 
 ARTIFACTS := _out
 TOOLS ?= ghcr.io/talos-systems/tools:v0.9.0-alpha.0-5-g96e0231
-PKGS ?= v0.9.0-alpha.0-21-g422276d
-EXTRAS ?= v0.7.0-alpha.0-1-g2bb2efc
+PKGS ?= v0.9.0-alpha.0-22-g80a5f97
+EXTRAS ?= v0.7.0-alpha.0-2-g50fc401
 GO_VERSION ?= 1.17
 GOFUMPT_VERSION ?= v0.1.1
 GOLANGCILINT_VERSION ?= v1.43.0

diff --git a/hack/release.toml b/hack/release.toml
@@ -46,6 +46,7 @@ see `.machine.logging` machine configuration option.
 * containerd: 1.5.8
 * Kubernetes: 1.23.0-rc.0
 * CoreDNS: 1.8.6
+* Flannel (default CNI): 0.15.1
 
 Talos is built with Go 1.17.3
 """

diff --git a/pkg/images/list.go b/pkg/images/list.go
@@ -37,7 +37,7 @@ func List(config config.Provider) Versions {
 
 	images.Etcd = config.Cluster().Etcd().Image()
 	images.CoreDNS = config.Cluster().CoreDNS().Image()
-	images.Flannel = "quay.io/coreos/flannel:v0.13.0"
+	images.Flannel = "quay.io/coreos/flannel:v0.15.1"
 	images.FlannelCNI = fmt.Sprintf("ghcr.io/talos-systems/install-cni:%s", version.ExtrasVersion)
 	images.Kubelet = config.Machine().Kubelet().Image()
 	images.KubeAPIServer = config.Cluster().APIServer().Image()

diff --git a/pkg/provision/providers/qemu/launch.go b/pkg/provision/providers/qemu/launch.go
@@ -122,6 +122,7 @@ func withCNI(ctx context.Context, config *LaunchConfig, f func(config *LaunchCon
 		Args: [][2]string{
 			{"IP", strings.Join(ips, ",")},
 			{"GATEWAY", strings.Join(gatewayAddrs, ",")},
+			{"IgnoreUnknown", "1"},
 		},
 	}
 

diff --git a/pkg/provision/providers/vm/network.go b/pkg/provision/providers/vm/network.go
@@ -94,6 +94,7 @@ func (p *Provisioner) CreateNetwork(ctx context.Context, state *State, network p
 		Args: [][2]string{
 			{"IP", strings.Join(fakeIPs, ",")},
 			{"GATEWAY", strings.Join(gatewayAddrs, ",")},
+			{"IgnoreUnknown", "1"},
 		},
 	}