From 24a7878e7cf53e65df8970951f3b7a6e3c65645b Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Sat, 1 Aug 2020 09:34:04 +0200
Subject: [PATCH] Update kube-router to 1.0.1 and kube-ovn to 1.3.0 (#6479)

---
 README.md                                                   | 4 ++--
 roles/download/defaults/main.yml                            | 4 ++--
 roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2 | 4 ++--
 roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2      | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 00c040b08..31b54eabb 100644
--- a/README.md
+++ b/README.md
@@ -127,8 +127,8 @@ Note: Upstart/SysV init based OS types are not supported.
   - [cilium](https://github.com/cilium/cilium) v1.8.1
   - [contiv](https://github.com/contiv/install) v1.2.1
   - [flanneld](https://github.com/coreos/flannel) v0.12.0
-  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.1
-  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.0
+  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.3.0
+  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.1
   - [multus](https://github.com/intel/multus-cni) v3.6.0
   - [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.0.0
   - [weave](https://github.com/weaveworks/weave) v2.6.5
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 351f08a2b..bbe497008 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -80,8 +80,8 @@ weave_version: 2.6.5
 pod_infra_version: "3.2"
 contiv_version: 1.2.1
 cilium_version: "v1.8.1"
-kube_ovn_version: "v1.2.1"
-kube_router_version: "v1.0.0"
+kube_ovn_version: "v1.3.0"
+kube_router_version: "v1.0.1"
 multus_version: "v3.6"
 ovn4nfv_ovn_image_version: "v1.0.0"
 ovn4nfv_k8s_plugin_image_version: "v1.0.0"
diff --git a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2 b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
index f6ca42c82..ca6ae9414 100644
--- a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
@@ -128,8 +128,8 @@ spec:
           - --encap-checksum={{ encap_checksum }}
           - --service-cluster-ip-range={{ kube_service_addresses }}
         securityContext:
-          capabilities:
-            add: ["NET_ADMIN", "SYS_ADMIN", "SYS_PTRACE"]
+          runAsUser: 0
+          privileged: true
         env:
           - name: POD_IP
             valueFrom:
diff --git a/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2 b/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
index 2ffe0dd61..6371bc0ca 100644
--- a/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
@@ -283,6 +283,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: HW_OFFLOAD
+              value: "false"
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules