rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-31 22:46:25 +00:00
Code Issues Releases Wiki Activity

Add k8s 1.15

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2019-06-24 22:16:37 +02:00
committed by Alena Prokharchyk
parent fb11fc3317
commit 9985bc8bae
7 changed files with 1595 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/network.go
View File

@@ -245,7 +245,7 @@ func (c *Cluster) doWeaveDeploy(ctx context.Context) error {
func (c *Cluster) getNetworkPluginManifest(pluginConfig map[string]interface{}) (string, error) {
switch c.Network.Plugin {
case FlannelNetworkPlugin:
return templates.CompileTemplateFromMap(templates.FlannelTemplate, pluginConfig)
return templates.CompileTemplateFromMap(templates.GetVersionedTemplates(FlannelNetworkPlugin, c.Version), pluginConfig)
case CalicoNetworkPlugin:
return templates.CompileTemplateFromMap(templates.GetVersionedTemplates(CalicoNetworkPlugin, c.Version), pluginConfig)
case CanalNetworkPlugin: