From 51a5fc424f2457231558ad0982673d2a86fe5a18 Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
Date: Mon, 16 Dec 2019 14:37:03 +0100
Subject: [PATCH] Switch to conflist cni configuration for flannel

Switches to use the newer `conflist` cni configuration. This is required
because Kubernetes v1.16.0 introduces config validation:
https://github.com/kubernetes/kubernetes/pull/80482 which is no longer
able to validate the old configuration. The behavior is the same with
the new configuration.

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
---
 cluster/manifests/flannel/configmap.yaml | 11 ++++++++---
 cluster/manifests/flannel/daemonset.yaml |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cluster/manifests/flannel/configmap.yaml b/cluster/manifests/flannel/configmap.yaml
index 36a0ae086d..35c8c8c9a6 100644
--- a/cluster/manifests/flannel/configmap.yaml
+++ b/cluster/manifests/flannel/configmap.yaml
@@ -8,12 +8,17 @@ metadata:
 data:
   cni-conf.json: |
     {
-        "name": "podnet",
-        "type": "flannel",
-        "delegate": {
+      "name": "podnet",
+      "cniVersion": "0.3.1",
+      "plugins": [
+        {
+          "type": "flannel",
+          "delegate": {
             "isDefaultGateway": true,
             "hairpinMode": true
+          }
         }
+      ]
     }
   net-conf.json: |
     {
diff --git a/cluster/manifests/flannel/daemonset.yaml b/cluster/manifests/flannel/daemonset.yaml
index 3e24877c9c..736ffed258 100644
--- a/cluster/manifests/flannel/daemonset.yaml
+++ b/cluster/manifests/flannel/daemonset.yaml
@@ -35,7 +35,7 @@ spec:
           - name: CNI_CONFIG_SOURCE
             value: /etc/kube-flannel/cni-conf.json
           - name: CNI_CONFIG_TARGET
-            value: /etc/cni/net.d/10-flannel.conf
+            value: /etc/cni/net.d/10-flannel.conflist
         resources:
           requests:
             cpu: 25m