From 98f7485303b8866ef7fe5cc1c29e5fd258349560 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Thu, 20 Aug 2020 13:33:36 +0200
Subject: [PATCH] Update weave to 2.7.0 + minor update to Cilium (#6501)
---
README.md | 4 ++--
roles/download/defaults/main.yml | 4 ++--
roles/network_plugin/weave/templates/weave-net.yml.j2 | 6 ++++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 20cde4339..854edfb3d 100644
--- a/README.md
+++ b/README.md
@@ -124,14 +124,14 @@ Note: Upstart/SysV init based OS types are not supported.
- [cni-plugins](https://github.com/containernetworking/plugins) v0.8.6
- [calico](https://github.com/projectcalico/calico) v3.15.1
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- - [cilium](https://github.com/cilium/cilium) v1.8.1
+ - [cilium](https://github.com/cilium/cilium) v1.8.2
- [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.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
+ - [weave](https://github.com/weaveworks/weave) v2.7.0
- Application
- [ambassador](https://github.com/datawire/ambassador): v1.5
- [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 1380c6b4c..9ef2ec9eb 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -76,10 +76,10 @@ flannel_version: "v0.12.0"
cni_version: "v0.8.6"
-weave_version: 2.6.5
+weave_version: 2.7.0
pod_infra_version: "3.2"
contiv_version: 1.2.1
-cilium_version: "v1.8.1"
+cilium_version: "v1.8.2"
kube_ovn_version: "v1.3.0"
kube_router_version: "v1.0.1"
multus_version: "v3.6"
diff --git a/roles/network_plugin/weave/templates/weave-net.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2
index c9ac057a1..28540bcfa 100644
--- a/roles/network_plugin/weave/templates/weave-net.yml.j2
+++ b/roles/network_plugin/weave/templates/weave-net.yml.j2
@@ -181,7 +181,7 @@ items:
port: 6784
resources:
requests:
- cpu: 10m
+ cpu: 50m
securityContext:
privileged: true
volumeMounts:
@@ -199,6 +199,7 @@ items:
mountPath: /lib/modules
- name: xtables-lock
mountPath: /run/xtables.lock
+ readOnly: false
- name: weave-npc
env:
- name: HOSTNAME
@@ -210,12 +211,13 @@ items:
imagePullPolicy: {{ k8s_image_pull_policy }}
resources:
requests:
- cpu: 10m
+ cpu: 50m
securityContext:
privileged: true
volumeMounts:
- name: xtables-lock
mountPath: /run/xtables.lock
+ readOnly: false
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
hostPID: true
--
GitLab