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

Change cloud_provider to calico_cloud_provider

Browse Source
This commit is contained in:
galal-hussein
2017-12-13 20:14:10 +02:00
parent e58d7685da
commit b20c0cf419
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/network.go
View File

@@ -11,7 +11,6 @@ import (
const ( const (
NetworkPluginResourceName = "rke-network-plugin" NetworkPluginResourceName = "rke-network-plugin"
CloudProvider = "cloud_provider"
FlannelNetworkPlugin = "flannel" FlannelNetworkPlugin = "flannel"
FlannelImage = "flannel_image" FlannelImage = "flannel_image"
@@ -23,6 +22,7 @@ const (
CalicoCNIImage = "calico_cni_image" CalicoCNIImage = "calico_cni_image"
CalicoControllersImages = "calico_controllers_image" CalicoControllersImages = "calico_controllers_image"
CalicoctlImage = "calicoctl_image" CalicoctlImage = "calicoctl_image"
CalicoCloudProvider = "calico_cloud_provider"
CanalNetworkPlugin = "canal" CanalNetworkPlugin = "canal"
CanalNodeImage = "canal_node_image" CanalNodeImage = "canal_node_image"
@@ -74,7 +74,7 @@ func (c *Cluster) doCalicoDeploy() error {
network.NodeImage: c.Network.Options[CalicoNodeImage], network.NodeImage: c.Network.Options[CalicoNodeImage],
network.ControllersImage: c.Network.Options[CalicoControllersImages], network.ControllersImage: c.Network.Options[CalicoControllersImages],
network.CalicoctlImage: c.Network.Options[CalicoctlImage], network.CalicoctlImage: c.Network.Options[CalicoctlImage],
network.CloudProvider: c.Network.Options[CloudProvider], network.CloudProvider: c.Network.Options[CalicoCloudProvider],
} }
pluginYaml := network.GetCalicoManifest(calicoConfig) pluginYaml := network.GetCalicoManifest(calicoConfig)
return c.doAddonDeploy(pluginYaml, NetworkPluginResourceName) return c.doAddonDeploy(pluginYaml, NetworkPluginResourceName)
@@ -120,7 +120,7 @@ func (c *Cluster) setClusterNetworkDefaults() {
CalicoCNIImage: DefaultCalicoCNIImage, CalicoCNIImage: DefaultCalicoCNIImage,
CalicoNodeImage: DefaultCalicoNodeImage, CalicoNodeImage: DefaultCalicoNodeImage,
CalicoControllersImages: DefaultCalicoControllersImage, CalicoControllersImages: DefaultCalicoControllersImage,
CloudProvider: DefaultNetworkCloudProvider, CalicoCloudProvider: DefaultNetworkCloudProvider,
CalicoctlImage: DefaultCalicoctlImage, CalicoctlImage: DefaultCalicoctlImage,
} }