Pass-through empty nodeSelector to podSpecs

There is no need drop empty nodeSelector maps, omitempty already does this
openstack-k8s-operators · Nov 18, 2024 · 1a349e3 · 1a349e3
1 parent 6d9ec1b
commit 1a349e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/pkg/keystone/bootstrap.go b/pkg/keystone/bootstrap.go
@@ -117,7 +117,7 @@ func BootstrapJob(
 	}
 	job.Spec.Template.Spec.Containers[0].Env = env.MergeEnvs(job.Spec.Template.Spec.Containers[0].Env, envVars)
 
-	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+	if instance.Spec.NodeSelector != nil {
 		job.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
 	}
 

diff --git a/pkg/keystone/cronjob.go b/pkg/keystone/cronjob.go
@@ -98,7 +98,7 @@ func CronJob(
 			},
 		},
 	}
-	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+	if instance.Spec.NodeSelector != nil {
 		cronjob.Spec.JobTemplate.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
 	}
 	return cronjob

diff --git a/pkg/keystone/dbsync.go b/pkg/keystone/dbsync.go
@@ -90,7 +90,7 @@ func DbSyncJob(
 		},
 	}
 
-	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+	if instance.Spec.NodeSelector != nil {
 		job.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
 	}
 

diff --git a/pkg/keystone/deployment.go b/pkg/keystone/deployment.go
@@ -158,8 +158,10 @@ func Deployment(
 		},
 		corev1.LabelHostname,
 	)
-	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+
+	if instance.Spec.NodeSelector != nil {
 		deployment.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
 	}
+
 	return deployment, nil
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ func DbSyncJob( @@
     		},
     	}
-    	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+    	if instance.Spec.NodeSelector != nil {
     		job.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
     	}
@@ Expand Down @@