Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
98f74853
Unverified
Commit
98f74853
authored
4 years ago
by
Florian Ruynat
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update weave to 2.7.0 + minor update to Cilium (#6501)
parent
a42d8114
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+2
-2
2 additions, 2 deletions
README.md
roles/download/defaults/main.yml
+2
-2
2 additions, 2 deletions
roles/download/defaults/main.yml
roles/network_plugin/weave/templates/weave-net.yml.j2
+4
-2
4 additions, 2 deletions
roles/network_plugin/weave/templates/weave-net.yml.j2
with
8 additions
and
6 deletions
README.md
+
2
−
2
View file @
98f74853
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
roles/download/defaults/main.yml
+
2
−
2
View file @
98f74853
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/weave/templates/weave-net.yml.j2
+
4
−
2
View file @
98f74853
...
...
@@ -181,7 +181,7 @@ items:
port: 6784
resources:
requests:
cpu:
1
0m
cpu:
5
0m
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:
1
0m
cpu:
5
0m
securityContext:
privileged: true
volumeMounts:
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
hostPID: true
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment