rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-02 07:24:20 +00:00
Code Issues Releases Wiki Activity

merge head & add weave-net network plugin configuration cluster cidr, weave_image, weave_cni_image

Browse Source
This commit is contained in:
kyamazawa
2017-12-06 12:53:51 +09:00
parent f5797c6ba3
commit 82dce19ac8
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/network.go
View File

@@ -25,6 +25,10 @@ const (
CanalNodeImage = "canal_node_image"
CanalCNIImage = "canal_cni_image"
CanalFlannelImage = "canal_flannel_image"
WeaveNetworkPlugin = "weave"
WeaveImage = "weave_node_image"
WeaveCNIImage = "weave_cni_image"
)
func (c *Cluster) DeployNetworkPlugin() error {
@@ -81,8 +85,7 @@ func (c *Cluster) doCanalDeploy() error {
}
func (c *Cluster) doWeaveDeploy() error {
weaveConfig := make(map[string]string)
pluginYaml := network.GetWeaveManifest(weaveConfig)
pluginYaml := network.GetWeaveManifest(c.ClusterCIDR, c.Network.Options[WeaveImage], c.Network.Options[WeaveCNIImage])
return c.doAddonDeploy(pluginYaml, NetworkPluginResourceName)
}
@@ -107,5 +110,9 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmptyMapValue(c.Network.Options, CanalCNIImage, DefaultCanalCNIImage)
setDefaultIfEmptyMapValue(c.Network.Options, CanalNodeImage, DefaultCanalNodeImage)
setDefaultIfEmptyMapValue(c.Network.Options, CanalFlannelImage, DefaultCanalFlannelImage)
case c.Network.Plugin == WeaveNetworkPlugin:
setDefaultIfEmptyMapValue(c.Network.Options, WeaveImage, DefaultWeaveImage)
setDefaultIfEmptyMapValue(c.Network.Options, WeaveCNIImage, DefaultWeaveCNIImage)
}
}