rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-14 13:03:06 +00:00
Code Issues Releases Wiki Activity

Add weave loopback binary

Browse Source
This commit is contained in:
galal-hussein 2018-05-17 02:27:47 +02:00 committed by Alena Prokharchyk
parent 80b88f9d32
commit 08358c85cd
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cluster/network.go
View File

@ -75,11 +75,12 @@ const (
ClusterCIDR = "ClusterCIDR" ClusterCIDR = "ClusterCIDR"
// Images key names // Images key names
Image = "Image" Image = "Image"
CNIImage = "CNIImage" CNIImage = "CNIImage"
NodeImage = "NodeImage" NodeImage = "NodeImage"
ControllersImage = "ControllersImage" ControllersImage = "ControllersImage"
CanalFlannelImg = "CanalFlannelImg" CanalFlannelImg = "CanalFlannelImg"
WeaveLoopbackImage = "WeaveLoopbackImage"
Calicoctl = "Calicoctl" Calicoctl = "Calicoctl"
@ -174,10 +175,11 @@ func (c *Cluster) doCanalDeploy(ctx context.Context) error {
func (c *Cluster) doWeaveDeploy(ctx context.Context) error { func (c *Cluster) doWeaveDeploy(ctx context.Context) error {
weaveConfig := map[string]string{ weaveConfig := map[string]string{
ClusterCIDR: c.ClusterCIDR, ClusterCIDR: c.ClusterCIDR,
Image: c.SystemImages.WeaveNode, Image: c.SystemImages.WeaveNode,
CNIImage: c.SystemImages.WeaveCNI, CNIImage: c.SystemImages.WeaveCNI,
RBACConfig: c.Authorization.Mode, WeaveLoopbackImage: c.SystemImages.Alpine,
RBACConfig: c.Authorization.Mode,
} }
pluginYaml, err := c.getNetworkPluginManifest(weaveConfig) pluginYaml, err := c.getNetworkPluginManifest(weaveConfig)
if err != nil { if err != nil {

9
templates/weave.go
View File

@ -80,6 +80,15 @@ items:
volumeMounts: volumeMounts:
- name: xtables-lock - name: xtables-lock
mountPath: /run/xtables.lock mountPath: /run/xtables.lock
- name: weave-loopback
command:
- /opt/rke/weave-loopback-cni.sh
image: {{.WeaveLoopbackImage}}
securityContext:
privileged: true
volumeMounts:
- name: cni-bin
mountPath: /opt
hostNetwork: true hostNetwork: true
hostPID: true hostPID: true
restartPolicy: Always restartPolicy: Always