From e5886794dc867953c6ecf4f0542f3b5c7079b28b Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Wed, 13 Feb 2019 11:42:42 +0200 Subject: [PATCH] create-cluster-kubeadm: update flannel to 0.11.0 (#12493) Use this commit: https://github.com/coreos/flannel/commit/a70459be0084506e4ec919aa1 instead of the v0.11.0 tag because the tag is missing the 0.11.0 images as can be seen here: https://raw.githubusercontent.com/coreos/flannel/v0.11.0/Documentation/kube-flannel.yml Add note about supporting s390x on Linux and preliminary support for Windows. --- content/en/docs/setup/independent/create-cluster-kubeadm.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/content/en/docs/setup/independent/create-cluster-kubeadm.md b/content/en/docs/setup/independent/create-cluster-kubeadm.md index d413488644..be3fdbe7d0 100644 --- a/content/en/docs/setup/independent/create-cluster-kubeadm.md +++ b/content/en/docs/setup/independent/create-cluster-kubeadm.md @@ -337,10 +337,11 @@ Set `/proc/sys/net/bridge/bridge-nf-call-iptables` to `1` by running `sysctl net to pass bridged IPv4 traffic to iptables' chains. This is a requirement for some CNI plugins to work, for more information please see [here](https://kubernetes.io/docs/concepts/cluster-administration/network-plugins/#network-plugin-requirements). -Note that `flannel` works on `amd64`, `arm`, `arm64` and `ppc64le`. +Note that `flannel` works on `amd64`, `arm`, `arm64`, `ppc64le` and `s390x` under Linux. +Windows (`amd64`) is claimed as supported in v0.11.0 but the usage is undocumented. ```shell -kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/bc79dd1505b0c8681ece4de4c0d86c5cd2643275/Documentation/kube-flannel.yml +kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/a70459be0084506e4ec919aa1c114638878db11b/Documentation/kube-flannel.yml ``` For more information about `flannel`, see [the CoreOS flannel repository on GitHub