mirror of
https://github.com/rancher/rke.git
synced 2025-05-09 00:37:01 +00:00
Add CanalControllers to support Canal v3.14.0+
Signed-off-by: Chris Kim <oats87g@gmail.com>
This commit is contained in:
parent
41706a0680
commit
0522b664ac
@ -230,18 +230,19 @@ func (c *Cluster) doCanalDeploy(ctx context.Context, data map[string]interface{}
|
||||
|
||||
clientConfig := pki.GetConfigPath(pki.KubeNodeCertName)
|
||||
canalConfig := map[string]interface{}{
|
||||
ClientCertPath: pki.GetCertPath(pki.KubeNodeCertName),
|
||||
APIRoot: "https://127.0.0.1:6443",
|
||||
ClientKeyPath: pki.GetKeyPath(pki.KubeNodeCertName),
|
||||
ClientCAPath: pki.GetCertPath(pki.CACertName),
|
||||
KubeCfg: clientConfig,
|
||||
ClusterCIDR: c.ClusterCIDR,
|
||||
NodeImage: c.SystemImages.CanalNode,
|
||||
CNIImage: c.SystemImages.CanalCNI,
|
||||
CanalFlannelImg: c.SystemImages.CanalFlannel,
|
||||
RBACConfig: c.Authorization.Mode,
|
||||
CanalInterface: c.Network.Options[CanalIface],
|
||||
FlexVolImg: c.SystemImages.CanalFlexVol,
|
||||
ClientCertPath: pki.GetCertPath(pki.KubeNodeCertName),
|
||||
APIRoot: "https://127.0.0.1:6443",
|
||||
ClientKeyPath: pki.GetKeyPath(pki.KubeNodeCertName),
|
||||
ClientCAPath: pki.GetCertPath(pki.CACertName),
|
||||
KubeCfg: clientConfig,
|
||||
ClusterCIDR: c.ClusterCIDR,
|
||||
NodeImage: c.SystemImages.CanalNode,
|
||||
CNIImage: c.SystemImages.CanalCNI,
|
||||
ControllersImage: c.SystemImages.CanalControllers,
|
||||
CanalFlannelImg: c.SystemImages.CanalFlannel,
|
||||
RBACConfig: c.Authorization.Mode,
|
||||
CanalInterface: c.Network.Options[CanalIface],
|
||||
FlexVolImg: c.SystemImages.CanalFlexVol,
|
||||
FlannelBackend: map[string]interface{}{
|
||||
"Type": c.Network.Options[CanalFlannelBackendType],
|
||||
"VNI": flannelVni,
|
||||
|
@ -151,6 +151,8 @@ type RKESystemImages struct {
|
||||
CanalNode string `yaml:"canal_node" json:"canalNode,omitempty"`
|
||||
// Canal CNI image
|
||||
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 string `yaml:"canal_flannel" json:"canalFlannel,omitempty"`
|
||||
//CanalFlexVol image
|
||||
|
Loading…
Reference in New Issue
Block a user