Browse Source

Update weave to 2.7.0 + minor update to Cilium (#6501)

pull/6532/head
Florian Ruynat 4 years ago
committed by GitHub
parent
commit
98f7485303
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
  1. 4
      README.md
  2. 4
      roles/download/defaults/main.yml
  3. 6
      roles/network_plugin/weave/templates/weave-net.yml.j2

4
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

4
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"

6
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

Loading…
Cancel
Save