From 1a62caf48086ce78c46a438679f90e39aeed8c44 Mon Sep 17 00:00:00 2001 From: Rajat Chopra Date: Mon, 11 Oct 2021 15:43:03 -0700 Subject: [PATCH 1/2] install flannel cni plugin binary in opt/cni/bin directory of the host using an init container --- Documentation/kube-flannel.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml index c7edaef7b..fca9f5c67 100644 --- a/Documentation/kube-flannel.yml +++ b/Documentation/kube-flannel.yml @@ -165,6 +165,17 @@ spec: effect: NoSchedule serviceAccountName: flannel initContainers: + - name: install-cni-plugin + image: rancher/flannel-cni-plugin:v1.2 + command: + - cp + args: + - -f + - /flannel + - /opt/cni/bin/flannel + volumeMounts: + - name: cni-plugin + mountPath: /opt/cni/bin - name: install-cni image: quay.io/coreos/flannel:v0.14.0 command: @@ -215,6 +226,9 @@ spec: - name: run hostPath: path: /run/flannel + - name: cni-plugin + hostPath: + path: /opt/cni/bin - name: cni hostPath: path: /etc/cni/net.d From 8dddf2f29934313e0e8e67541e4afb5446009b66 Mon Sep 17 00:00:00 2001 From: Rajat Chopra Date: Mon, 11 Oct 2021 16:12:37 -0700 Subject: [PATCH 2/2] update flannel release number to v0.15.0-rc1 --- Documentation/kube-flannel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml index fca9f5c67..21442369c 100644 --- a/Documentation/kube-flannel.yml +++ b/Documentation/kube-flannel.yml @@ -177,7 +177,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: quay.io/coreos/flannel:v0.14.0 + image: quay.io/coreos/flannel:v0.15.0-rc1 command: - cp args: @@ -191,7 +191,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: quay.io/coreos/flannel:v0.14.0 + image: quay.io/coreos/flannel:v0.15.0-rc1 command: - /opt/bin/flanneld args: