Merge branch 'marlow/gl_48' into 'main'

fix: Mutating webhook should unset spec.nodeName

See merge request SchedMD/slinky-dev/slurm-bridge!120

Author: catblade

internal/admission/admission.go

@@ -46,6 +46,15 @@ func (r *PodAdmission) Default(ctx context.Context, pod *corev1.Pod) error {
 	if !isManaged && pod.Spec.SchedulerName != r.SchedulerName {
 		return nil
 	}
+
+	// On create, unset spec.nodeName so the pod is scheduled by slurm-bridge.
+	if req, err := admission.RequestFromContext(ctx); err == nil && req.Operation == "CREATE" {
+		if pod.Spec.NodeName != "" {
+			logger.V(1).Info("Unsetting spec.nodeName on create so slurm scheduling will occur", "pod", klog.KObj(pod), "previousNodeName", pod.Spec.NodeName)
+			pod.Spec.NodeName = ""
+		}
+	}
+
 	if pod.Spec.SchedulerName == corev1.DefaultSchedulerName {
 		pod.Spec.SchedulerName = r.SchedulerName
 	}

internal/admission/admission_test.go

@@ -89,10 +89,11 @@ func TestPodAdmission_Namespaces(t *testing.T) {
 		pod *corev1.Pod
 	}
 	tests := []struct {
-		name    string
-		args    args
-		wantErr bool
-		sched   string
+		name         string
+		args         args
+		wantErr      bool
+		sched        string
+		wantNodeName string
 	}{
 		{
 			name: "PodWithDefaultNamespace",
@@ -250,6 +251,52 @@ func TestPodAdmission_Namespaces(t *testing.T) {
 			wantErr: false,
 			sched:   corev1.DefaultSchedulerName,
 		},
+		{
+			name: "PodWithNodeNameOnCreateInManagedNamespace_unsetsNodeName",
+			args: args{
+				ctx: contextWithAdmissionOperation("CREATE"),
+				pod: &corev1.Pod{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-pod",
+						Namespace: namespace,
+						Labels:    map[string]string{"app": "test-app"},
+					},
+					Spec: corev1.PodSpec{
+						SchedulerName: corev1.DefaultSchedulerName,
+						NodeName:      "some-node",
+						Containers: []corev1.Container{
+							{Name: "test-container", Image: "test-image"},
+						},
+					},
+				},
+			},
+			wantErr:      false,
+			sched:        SchedulerName,
+			wantNodeName: "",
+		},
+		{
+			name: "PodWithNodeNameOnUpdateInManagedNamespace_preservesNodeName",
+			args: args{
+				ctx: contextWithAdmissionOperation("UPDATE"),
+				pod: &corev1.Pod{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "test-pod",
+						Namespace: namespace,
+						Labels:    map[string]string{"app": "test-app"},
+					},
+					Spec: corev1.PodSpec{
+						SchedulerName: corev1.DefaultSchedulerName,
+						NodeName:      "some-node",
+						Containers: []corev1.Container{
+							{Name: "test-container", Image: "test-image"},
+						},
+					},
+				},
+			},
+			wantErr:      false,
+			sched:        SchedulerName,
+			wantNodeName: "some-node",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -266,10 +313,20 @@ func TestPodAdmission_Namespaces(t *testing.T) {
 			if tt.args.pod.Spec.SchedulerName != tt.sched {
 				t.Errorf("PodAdmission.Default() scheduler = %s, want scheduler %s", tt.args.pod.Spec.SchedulerName, tt.sched)
 			}
+			if tt.args.pod.Spec.NodeName != tt.wantNodeName {
+				t.Errorf("PodAdmission.Default() nodeName = %q, want %q", tt.args.pod.Spec.NodeName, tt.wantNodeName)
+			}
 		})
 	}
 }
 
+// contextWithAdmissionOperation returns a context with an admission request for the given operation.
+func contextWithAdmissionOperation(op string) context.Context {
+	req := admission.Request{}
+	reflect.ValueOf(&req).Elem().FieldByName("Operation").SetString(op)
+	return admission.NewContextWithRequest(context.TODO(), req)
+}
+
 func TestPodAdmission_ValidateCreate(t *testing.T) {
 	type fields struct {
 		SchedulerName     string