rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-24 22:42:23 +00:00
Code Issues Releases Wiki Activity

Add CanalControllers to support Canal v3.14.0+

Browse Source 
Signed-off-by: Chris Kim <oats87g@gmail.com>
This commit is contained in:
Chris Kim 2020-09-04 17:49:39 -07:00
parent 41706a0680
commit 0522b664ac
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cluster/network.go
View File

@ -230,18 +230,19 @@ func (c *Cluster) doCanalDeploy(ctx context.Context, data map[string]interface{}
clientConfig := pki.GetConfigPath(pki.KubeNodeCertName) clientConfig := pki.GetConfigPath(pki.KubeNodeCertName)
canalConfig := map[string]interface{}{ canalConfig := map[string]interface{}{
ClientCertPath: pki.GetCertPath(pki.KubeNodeCertName), ClientCertPath: pki.GetCertPath(pki.KubeNodeCertName),
APIRoot: "https://127.0.0.1:6443", APIRoot: "https://127.0.0.1:6443",
ClientKeyPath: pki.GetKeyPath(pki.KubeNodeCertName), ClientKeyPath: pki.GetKeyPath(pki.KubeNodeCertName),
ClientCAPath: pki.GetCertPath(pki.CACertName), ClientCAPath: pki.GetCertPath(pki.CACertName),
KubeCfg: clientConfig, KubeCfg: clientConfig,
ClusterCIDR: c.ClusterCIDR, ClusterCIDR: c.ClusterCIDR,
NodeImage: c.SystemImages.CanalNode, NodeImage: c.SystemImages.CanalNode,
CNIImage: c.SystemImages.CanalCNI, CNIImage: c.SystemImages.CanalCNI,
CanalFlannelImg: c.SystemImages.CanalFlannel, ControllersImage: c.SystemImages.CanalControllers,
RBACConfig: c.Authorization.Mode, CanalFlannelImg: c.SystemImages.CanalFlannel,
CanalInterface: c.Network.Options[CanalIface], RBACConfig: c.Authorization.Mode,
FlexVolImg: c.SystemImages.CanalFlexVol, CanalInterface: c.Network.Options[CanalIface],
FlexVolImg: c.SystemImages.CanalFlexVol,
FlannelBackend: map[string]interface{}{ FlannelBackend: map[string]interface{}{
"Type": c.Network.Options[CanalFlannelBackendType], "Type": c.Network.Options[CanalFlannelBackendType],
"VNI": flannelVni, "VNI": flannelVni,

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