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

Add nodeSelector in network and monitoring addons

Browse Source
This commit is contained in:
rajashree
2019-08-29 11:00:26 -07:00
committed by Alena Prokharchyk
parent e31b8b0bf5
commit 1b4f7939f1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons.go
View File

@@ -59,6 +59,7 @@ type ingressOptions struct {
type MetricsServerOptions struct { type MetricsServerOptions struct {
RBACConfig string RBACConfig string
Options map[string]string Options map[string]string
NodeSelector map[string]string
MetricsServerImage string MetricsServerImage string
Version string Version string
} }
@@ -334,6 +335,7 @@ func (c *Cluster) deployMetricServer(ctx context.Context, data map[string]interf
MetricsServerImage: c.SystemImages.MetricsServer, MetricsServerImage: c.SystemImages.MetricsServer,
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
Options: c.Monitoring.Options, Options: c.Monitoring.Options,
NodeSelector: c.Monitoring.NodeSelector,
Version: util.GetTagMajorVersion(versionTag), Version: util.GetTagMajorVersion(versionTag),
} }
tmplt, err := templates.GetVersionedTemplates(rkeData.MetricsServer, data, c.Version) tmplt, err := templates.GetVersionedTemplates(rkeData.MetricsServer, data, c.Version)

6
cluster/network.go
View File

@@ -107,6 +107,8 @@ const (
WeavePassword = "WeavePassword" WeavePassword = "WeavePassword"
RBACConfig = "RBACConfig" RBACConfig = "RBACConfig"
ClusterVersion = "ClusterVersion" ClusterVersion = "ClusterVersion"
NodeSelector = "NodeSelector"
) )
var EtcdPortList = []string{ var EtcdPortList = []string{
@@ -169,6 +171,7 @@ func (c *Cluster) doFlannelDeploy(ctx context.Context, data map[string]interface
}, },
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
ClusterVersion: util.GetTagMajorVersion(c.Version), ClusterVersion: util.GetTagMajorVersion(c.Version),
NodeSelector: c.Network.NodeSelector,
} }
pluginYaml, err := c.getNetworkPluginManifest(flannelConfig, data) pluginYaml, err := c.getNetworkPluginManifest(flannelConfig, data)
if err != nil { if err != nil {
@@ -190,6 +193,7 @@ func (c *Cluster) doCalicoDeploy(ctx context.Context, data map[string]interface{
CloudProvider: c.Network.Options[CalicoCloudProvider], CloudProvider: c.Network.Options[CalicoCloudProvider],
FlexVolImg: c.SystemImages.CalicoFlexVol, FlexVolImg: c.SystemImages.CalicoFlexVol,
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
NodeSelector: c.Network.NodeSelector,
} }
pluginYaml, err := c.getNetworkPluginManifest(calicoConfig, data) pluginYaml, err := c.getNetworkPluginManifest(calicoConfig, data)
if err != nil { if err != nil {
@@ -227,6 +231,7 @@ func (c *Cluster) doCanalDeploy(ctx context.Context, data map[string]interface{}
"VNI": flannelVni, "VNI": flannelVni,
"Port": flannelPort, "Port": flannelPort,
}, },
NodeSelector: c.Network.NodeSelector,
} }
pluginYaml, err := c.getNetworkPluginManifest(canalConfig, data) pluginYaml, err := c.getNetworkPluginManifest(canalConfig, data)
if err != nil { if err != nil {
@@ -243,6 +248,7 @@ func (c *Cluster) doWeaveDeploy(ctx context.Context, data map[string]interface{}
CNIImage: c.SystemImages.WeaveCNI, CNIImage: c.SystemImages.WeaveCNI,
WeaveLoopbackImage: c.SystemImages.Alpine, WeaveLoopbackImage: c.SystemImages.Alpine,
RBACConfig: c.Authorization.Mode, RBACConfig: c.Authorization.Mode,
NodeSelector: c.Network.NodeSelector,
} }
pluginYaml, err := c.getNetworkPluginManifest(weaveConfig, data) pluginYaml, err := c.getNetworkPluginManifest(weaveConfig, data)
if err != nil { if err != nil {