Pass-through empty nodeSelector to podSpecs

There is no need drop empty nodeSelector maps, omitempty already does this
openstack-k8s-operators · Nov 18, 2024 · 186f56e · 186f56e
1 parent 212832e
commit 186f56e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/placement/dbsync.go b/pkg/placement/dbsync.go
@@ -83,7 +83,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/placement/deployment.go b/pkg/placement/deployment.go
@@ -174,7 +174,7 @@ 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
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,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 @@