Add linux nodeSelector to all Helm jobs

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
k3s-io · Aug 20, 2021 · 5dad612 · 5dad612
1 parent 4d509b9
commit 5dad612
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/pkg/helm/controller.go b/pkg/helm/controller.go
@@ -47,6 +47,11 @@ const (
 	CRDName       = "helmcharts.helm.cattle.io"
 	ConfigCRDName = "helmchartconfigs.helm.cattle.io"
 	Name          = "helm-controller"
+
+	TaintExternalCloudProvider = "node.cloudprovider.kubernetes.io/uninitialized"
+	LabelNodeRolePrefix        = "node-role.kubernetes.io/"
+	LabelControlPlaneSuffix    = "control-plane"
+	LabelEtcdSuffix            = "etcd"
 )
 
 func Register(ctx context.Context, apply apply.Apply,
@@ -279,15 +284,19 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 		})
 	}
 
+	job.Spec.Template.Spec.NodeSelector = make(map[string]string)
+	job.Spec.Template.Spec.NodeSelector[core.LabelOSStable] = "linux"
+
 	if chart.Spec.Bootstrap {
+		job.Spec.Template.Spec.NodeSelector[LabelNodeRolePrefix+LabelControlPlaneSuffix] = "true"
 		job.Spec.Template.Spec.HostNetwork = true
 		job.Spec.Template.Spec.Tolerations = []core.Toleration{
 			{
-				Key:    "node.kubernetes.io/not-ready",
+				Key:    core.TaintNodeNotReady,
 				Effect: core.TaintEffectNoSchedule,
 			},
 			{
-				Key:      "node.cloudprovider.kubernetes.io/uninitialized",
+				Key:      TaintExternalCloudProvider,
 				Operator: core.TolerationOpEqual,
 				Value:    "true",
 				Effect:   core.TaintEffectNoSchedule,
@@ -297,12 +306,12 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 				Operator: core.TolerationOpExists,
 			},
 			{
-				Key:      "node-role.kubernetes.io/etcd",
+				Key:      LabelNodeRolePrefix + LabelEtcdSuffix,
 				Operator: core.TolerationOpExists,
 				Effect:   core.TaintEffectNoExecute,
 			},
 			{
-				Key:      "node-role.kubernetes.io/control-plane",
+				Key:      LabelNodeRolePrefix + LabelControlPlaneSuffix,
 				Operator: core.TolerationOpExists,
 				Effect:   core.TaintEffectNoSchedule,
 			},
@@ -318,8 +327,6 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 				Name:  "BOOTSTRAP",
 				Value: "true"},
 		}...)
-		job.Spec.Template.Spec.NodeSelector = make(map[string]string)
-		job.Spec.Template.Spec.NodeSelector["node-role.kubernetes.io/master"] = "true"
 	}
 
 	setProxyEnv(job)