rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 16:30:02 +00:00
Code Issues Releases Wiki Activity

Add ability to set MTU for CNI

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2019-12-06 17:59:15 +01:00
committed by Alena Prokharchyk
parent 8a3b24caac
commit 3ac9cad743
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/network.go
View File

@@ -105,6 +105,7 @@ const (
FlannelBackend = "FlannelBackend" FlannelBackend = "FlannelBackend"
CanalInterface = "CanalInterface" CanalInterface = "CanalInterface"
WeavePassword = "WeavePassword" WeavePassword = "WeavePassword"
MTU = "MTU"
RBACConfig = "RBACConfig" RBACConfig = "RBACConfig"
ClusterVersion = "ClusterVersion" ClusterVersion = "ClusterVersion"
@@ -194,6 +195,7 @@ func (c *Cluster) doCalicoDeploy(ctx context.Context, data map[string]interface{
FlexVolImg: c.SystemImages.CalicoFlexVol, FlexVolImg: c.SystemImages.CalicoFlexVol,
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
NodeSelector: c.Network.NodeSelector, NodeSelector: c.Network.NodeSelector,
MTU: c.Network.MTU,
} }
pluginYaml, err := c.getNetworkPluginManifest(calicoConfig, data) pluginYaml, err := c.getNetworkPluginManifest(calicoConfig, data)
if err != nil { if err != nil {
@@ -232,6 +234,7 @@ func (c *Cluster) doCanalDeploy(ctx context.Context, data map[string]interface{}
"Port": flannelPort, "Port": flannelPort,
}, },
NodeSelector: c.Network.NodeSelector, NodeSelector: c.Network.NodeSelector,
MTU: c.Network.MTU,
} }
pluginYaml, err := c.getNetworkPluginManifest(canalConfig, data) pluginYaml, err := c.getNetworkPluginManifest(canalConfig, data)
if err != nil { if err != nil {
@@ -249,6 +252,7 @@ func (c *Cluster) doWeaveDeploy(ctx context.Context, data map[string]interface{}
WeaveLoopbackImage: c.SystemImages.Alpine, WeaveLoopbackImage: c.SystemImages.Alpine,
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
NodeSelector: c.Network.NodeSelector, NodeSelector: c.Network.NodeSelector,
MTU: c.Network.MTU,
} }
pluginYaml, err := c.getNetworkPluginManifest(weaveConfig, data) pluginYaml, err := c.getNetworkPluginManifest(weaveConfig, data)
if err != nil { if err != nil {

3
cluster/validation.go
View File

@@ -70,6 +70,9 @@ func validateNetworkOptions(c *Cluster) error {
if c.Network.Plugin != NoNetworkPlugin && c.Network.Plugin != FlannelNetworkPlugin && c.Network.Plugin != CalicoNetworkPlugin && c.Network.Plugin != CanalNetworkPlugin && c.Network.Plugin != WeaveNetworkPlugin { if c.Network.Plugin != NoNetworkPlugin && c.Network.Plugin != FlannelNetworkPlugin && c.Network.Plugin != CalicoNetworkPlugin && c.Network.Plugin != CanalNetworkPlugin && c.Network.Plugin != WeaveNetworkPlugin {
return fmt.Errorf("Network plugin [%s] is not supported", c.Network.Plugin) return fmt.Errorf("Network plugin [%s] is not supported", c.Network.Plugin)
} }
if c.Network.Plugin == FlannelNetworkPlugin && c.Network.MTU != "" {
return fmt.Errorf("Network plugin [%s] does not support configuring MTU", FlannelNetworkPlugin)
}
return nil return nil
} }