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

Fix weave configmap key

Browse Source
This commit is contained in:
galal-hussein 2019-03-05 20:50:19 +02:00 committed by Alena Prokharchyk
parent 8c4a920641
commit 1926fee1eb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/network.go
View File

@ -53,7 +53,6 @@ const (
CanalFlannelBackendType = "canal_flannel_backend_type" CanalFlannelBackendType = "canal_flannel_backend_type"
WeaveNetworkPlugin = "weave" WeaveNetworkPlugin = "weave"
WeavePasswordKey = "weave_password"
// List of map keys to be used with network templates // List of map keys to be used with network templates
@ -197,7 +196,7 @@ 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]interface{}{ weaveConfig := map[string]interface{}{
ClusterCIDR: c.ClusterCIDR, ClusterCIDR: c.ClusterCIDR,
WeavePassword: c.Network.Options[WeavePasswordKey], WeavePassword: c.Network.Options[WeavePassword],
Image: c.SystemImages.WeaveNode, Image: c.SystemImages.WeaveNode,
CNIImage: c.SystemImages.WeaveCNI, CNIImage: c.SystemImages.WeaveCNI,
WeaveLoopbackImage: c.SystemImages.Alpine, WeaveLoopbackImage: c.SystemImages.Alpine,