Remove tolerations if machine pool is empty

RedHatInsights · Mar 31, 2022 · 880d531 · 880d531
1 parent b841d60
commit 880d531
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/controllers/cloud.redhat.com/providers/cronjob/impl.go b/controllers/cloud.redhat.com/providers/cronjob/impl.go
@@ -105,6 +105,8 @@ func buildPodTemplate(app *crd.ClowdApp, env *crd.ClowdEnvironment, pt *core.Pod
 			Operator: core.TolerationOpEqual,
 			Value:    "true",
 		}}
+	} else {
+		pt.Spec.Tolerations = []core.Toleration{}
 	}
 
 	// set service account for pod

diff --git a/controllers/cloud.redhat.com/providers/deployment/impl.go b/controllers/cloud.redhat.com/providers/deployment/impl.go
@@ -213,6 +213,8 @@ func initDeployment(app *crd.ClowdApp, env *crd.ClowdEnvironment, d *apps.Deploy
 			Operator: core.TolerationOpEqual,
 			Value:    "true",
 		}}
+	} else {
+		d.Spec.Template.Spec.Tolerations = []core.Toleration{}
 	}
 
 	d.Spec.Template.Spec.InitContainers = ics

diff --git a/controllers/cloud.redhat.com/providers/job/impl.go b/controllers/cloud.redhat.com/providers/job/impl.go
@@ -73,6 +73,8 @@ func CreateJobResource(cji *crd.ClowdJobInvocation, env *crd.ClowdEnvironment, a
 			Operator: core.TolerationOpEqual,
 			Value:    "true",
 		}}
+	} else {
+		j.Spec.Template.Spec.Tolerations = []core.Toleration{}
 	}
 
 	if !env.Spec.Providers.Deployment.OmitPullPolicy {