From 2be363419f0cf6a497235a457f6511df396685d4 Mon Sep 17 00:00:00 2001
From: Kelly Birr <kelly@kellycodes.com>
Date: Thu, 19 Sep 2019 17:10:10 -0700
Subject: [PATCH] Support Kubernetes 1.16 and Linkerd

added "cniVersion": "0.2.0" to make it work in kubernetes 1.16
added NET_RAW support to PodSecurityPolicy to support Linkerd proxy injection
---
 Documentation/kube-flannel.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
index 8a30afc3f4..57df9af5cf 100644
--- a/Documentation/kube-flannel.yml
+++ b/Documentation/kube-flannel.yml
@@ -31,7 +31,7 @@ spec:
   allowPrivilegeEscalation: false
   defaultAllowPrivilegeEscalation: false
   # Capabilities
-  allowedCapabilities: ['NET_ADMIN']
+  allowedCapabilities: ['NET_ADMIN','NET_RAW']
   defaultAddCapabilities: []
   requiredDropCapabilities: []
   # Host namespaces
@@ -106,6 +106,7 @@ data:
   cni-conf.json: |
     {
       "name": "cbr0",
+      "cniVersion": "0.2.0",
       "plugins": [
         {
           "type": "flannel",