rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-07 18:04:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2229 from Oats87/add-canal-controllers

Browse Source 
Add CanalControllers to support Canal v3.14.0+
This commit is contained in:
Chris Kim 2020-09-08 11:15:37 -07:00 committed by GitHub
commit bdc58491d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/network.go
View File

@ -238,6 +238,7 @@ func (c *Cluster) doCanalDeploy(ctx context.Context, data map[string]interface{}
ClusterCIDR: c.ClusterCIDR, ClusterCIDR: c.ClusterCIDR,
NodeImage: c.SystemImages.CanalNode, NodeImage: c.SystemImages.CanalNode,
CNIImage: c.SystemImages.CanalCNI, CNIImage: c.SystemImages.CanalCNI,
ControllersImage: c.SystemImages.CanalControllers,
CanalFlannelImg: c.SystemImages.CanalFlannel, CanalFlannelImg: c.SystemImages.CanalFlannel,
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
CanalInterface: c.Network.Options[CanalIface], CanalInterface: c.Network.Options[CanalIface],

2
types/rke_types.go
View File

@ -151,6 +151,8 @@ type RKESystemImages struct {
CanalNode string `yaml:"canal_node" json:"canalNode,omitempty"` CanalNode string `yaml:"canal_node" json:"canalNode,omitempty"`
// Canal CNI image // Canal CNI image
CanalCNI string `yaml:"canal_cni" json:"canalCni,omitempty"` CanalCNI string `yaml:"canal_cni" json:"canalCni,omitempty"`
// Canal Controllers Image needed for Calico/Canal v3.14.0+
CanalControllers string `yaml:"canal_controllers" json:"canalControllers,omitempty"`
//CanalFlannel image //CanalFlannel image
CanalFlannel string `yaml:"canal_flannel" json:"canalFlannel,omitempty"` CanalFlannel string `yaml:"canal_flannel" json:"canalFlannel,omitempty"`
//CanalFlexVol image //CanalFlexVol image