fix: inherit node selectors for GitRepo sync jobs

AI assistance was limited to drafting this small patch and its unit coverage; the behavior was reviewed against the existing GitJob scheduling code.

Assisted-by: ChatGPT
Signed-off-by: immanuwell <pchpr.00@list.ru>

Author: immanuwell

internal/cmd/controller/gitops/reconciler/gitjob.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"os"
 	"slices"
 	"strconv"
@@ -198,6 +199,11 @@ func (r *GitJobReconciler) newGitJob(ctx context.Context, obj *v1alpha1.GitRepo)
 		jobSpec.Template.Spec.Tolerations,
 		fleetControllerDeployment.Spec.Template.Spec.Tolerations...,
 	)
+	if jobSpec.Template.Spec.NodeSelector == nil {
+		jobSpec.Template.Spec.NodeSelector = map[string]string{}
+	}
+	maps.Copy(jobSpec.Template.Spec.NodeSelector, fleetControllerDeployment.Spec.Template.Spec.NodeSelector)
+
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Annotations: map[string]string{

internal/cmd/controller/gitops/reconciler/gitjob_test.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"slices"
 	"strings"
@@ -595,6 +596,7 @@ func TestNewJob(t *testing.T) {
 		strictHostKeyChecks    bool
 		clientObjects          []runtime.Object
 		deploymentTolerations  []corev1.Toleration
+		deploymentNodeSelector map[string]string
 		expectedInitContainers []corev1.Container
 		expectedContainers     []corev1.Container
 		expectedVolumes        []corev1.Volume
@@ -1741,6 +1743,9 @@ func TestNewJob(t *testing.T) {
 					Operator: "Exists",
 				},
 			},
+			deploymentNodeSelector: map[string]string{
+				"node-role.kubernetes.io/fleet": "true",
+			},
 			clientObjects: []runtime.Object{
 				&corev1.ConfigMap{
 					ObjectMeta: metav1.ObjectMeta{
@@ -1760,7 +1765,7 @@ func TestNewJob(t *testing.T) {
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			r := GitJobReconciler{
-				Client:          getFakeClient(test.deploymentTolerations, test.clientObjects...),
+				Client:          getFakeClient(test.deploymentTolerations, test.deploymentNodeSelector, test.clientObjects...),
 				Scheme:          scheme,
 				Image:           "test",
 				Clock:           RealClock{},
@@ -1867,6 +1872,12 @@ func TestNewJob(t *testing.T) {
 			if !cmp.Equal(expectedTolerations, job.Spec.Template.Spec.Tolerations) {
 				t.Fatalf("job tolerations differ. Expecting: %v and found: %v", test.deploymentTolerations, job.Spec.Template.Spec.Tolerations)
 			}
+
+			expectedNodeSelector := map[string]string{"kubernetes.io/os": "linux"}
+			maps.Copy(expectedNodeSelector, test.deploymentNodeSelector)
+			if !cmp.Equal(expectedNodeSelector, job.Spec.Template.Spec.NodeSelector) {
+				t.Fatalf("job node selector differs. Expecting: %v and found: %v", expectedNodeSelector, job.Spec.Template.Spec.NodeSelector)
+			}
 		})
 	}
 }
@@ -2380,7 +2391,7 @@ func TestGenerateJob_EnvVars(t *testing.T) {
 			}
 
 			r := GitJobReconciler{
-				Client:          getFakeClient([]corev1.Toleration{}),
+				Client:          getFakeClient([]corev1.Toleration{}, nil),
 				Image:           "test",
 				Clock:           RealClock{},
 				SystemNamespace: config.DefaultNamespace,
@@ -2747,18 +2758,18 @@ ignore this line as well`,
 	}
 }
 
-func getFakeClient(tolerations []corev1.Toleration, objs ...runtime.Object) client.Client {
+func getFakeClient(tolerations []corev1.Toleration, nodeSelector map[string]string, objs ...runtime.Object) client.Client {
 	scheme := runtime.NewScheme()
 	utilruntime.Must(corev1.AddToScheme(scheme))
 	utilruntime.Must(appsv1.AddToScheme(scheme))
 
 	return fake.NewClientBuilder().
 		WithScheme(scheme).
 		WithRuntimeObjects(objs...).
-		WithRuntimeObjects(getFleetControllerDeployment(tolerations)).Build()
+		WithRuntimeObjects(getFleetControllerDeployment(tolerations, nodeSelector)).Build()
 }
 
-func getFleetControllerDeployment(tolerations []corev1.Toleration) *appsv1.Deployment {
+func getFleetControllerDeployment(tolerations []corev1.Toleration, nodeSelector map[string]string) *appsv1.Deployment {
 	return &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      config.ManagerConfigName,
@@ -2767,7 +2778,8 @@ func getFleetControllerDeployment(tolerations []corev1.Toleration) *appsv1.Deplo
 		Spec: appsv1.DeploymentSpec{
 			Template: corev1.PodTemplateSpec{
 				Spec: corev1.PodSpec{
-					Tolerations: tolerations,
+					Tolerations:  tolerations,
+					NodeSelector: nodeSelector,
 				},
 			},
 		},