From 1b4f7939f185ef873c4d23a8ecfda570a56e0d3a Mon Sep 17 00:00:00 2001
From: rajashree <rajashree.28m@gmail.com>
Date: Thu, 29 Aug 2019 11:00:26 -0700
Subject: [PATCH] Add nodeSelector in network and monitoring addons

---
 cluster/addons.go  | 2 ++
 cluster/network.go | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/cluster/addons.go b/cluster/addons.go
index 5f24050b..6eea6f2d 100644
--- a/cluster/addons.go
+++ b/cluster/addons.go
@@ -59,6 +59,7 @@ type ingressOptions struct {
 type MetricsServerOptions struct {
 	RBACConfig         string
 	Options            map[string]string
+	NodeSelector       map[string]string
 	MetricsServerImage string
 	Version            string
 }
@@ -334,6 +335,7 @@ func (c *Cluster) deployMetricServer(ctx context.Context, data map[string]interf
 		MetricsServerImage: c.SystemImages.MetricsServer,
 		RBACConfig:         c.Authorization.Mode,
 		Options:            c.Monitoring.Options,
+		NodeSelector:       c.Monitoring.NodeSelector,
 		Version:            util.GetTagMajorVersion(versionTag),
 	}
 	tmplt, err := templates.GetVersionedTemplates(rkeData.MetricsServer, data, c.Version)
diff --git a/cluster/network.go b/cluster/network.go
index 16f3569f..e62f90d7 100644
--- a/cluster/network.go
+++ b/cluster/network.go
@@ -107,6 +107,8 @@ const (
 	WeavePassword    = "WeavePassword"
 	RBACConfig       = "RBACConfig"
 	ClusterVersion   = "ClusterVersion"
+
+	NodeSelector = "NodeSelector"
 )
 
 var EtcdPortList = []string{
@@ -169,6 +171,7 @@ func (c *Cluster) doFlannelDeploy(ctx context.Context, data map[string]interface
 		},
 		RBACConfig:     c.Authorization.Mode,
 		ClusterVersion: util.GetTagMajorVersion(c.Version),
+		NodeSelector:   c.Network.NodeSelector,
 	}
 	pluginYaml, err := c.getNetworkPluginManifest(flannelConfig, data)
 	if err != nil {
@@ -190,6 +193,7 @@ func (c *Cluster) doCalicoDeploy(ctx context.Context, data map[string]interface{
 		CloudProvider:    c.Network.Options[CalicoCloudProvider],
 		FlexVolImg:       c.SystemImages.CalicoFlexVol,
 		RBACConfig:       c.Authorization.Mode,
+		NodeSelector:     c.Network.NodeSelector,
 	}
 	pluginYaml, err := c.getNetworkPluginManifest(calicoConfig, data)
 	if err != nil {
@@ -227,6 +231,7 @@ func (c *Cluster) doCanalDeploy(ctx context.Context, data map[string]interface{}
 			"VNI":  flannelVni,
 			"Port": flannelPort,
 		},
+		NodeSelector: c.Network.NodeSelector,
 	}
 	pluginYaml, err := c.getNetworkPluginManifest(canalConfig, data)
 	if err != nil {
@@ -243,6 +248,7 @@ func (c *Cluster) doWeaveDeploy(ctx context.Context, data map[string]interface{}
 		CNIImage:           c.SystemImages.WeaveCNI,
 		WeaveLoopbackImage: c.SystemImages.Alpine,
 		RBACConfig:         c.Authorization.Mode,
+		NodeSelector:       c.Network.NodeSelector,
 	}
 	pluginYaml, err := c.getNetworkPluginManifest(weaveConfig, data)
 	if err != nil {