Stateful set integration

* kueue.x-k8s.io/pod-group-fast-admission annotation

pkg/controller/jobs/pod/pod_controller.go

@@ -667,9 +667,38 @@ func (p *Pod) Load(ctx context.Context, c client.Client, key *types.NamespacedNa
 }
 
 func (p *Pod) constructGroupPodSets() ([]kueue.PodSet, error) {
+	if _, useFastAdmission := p.pod.GetAnnotations()[GroupFastAdmissionAnnotation]; useFastAdmission {
+		tc, err := p.groupTotalCount()
+		if err != nil {
+			return nil, err
+		}
+		return constructGroupPodSetsFast(p, tc)
+	}
 	return constructGroupPodSets(p.list.Items)
 }
 
+func constructGroupPodSetsFast(p *Pod, groupTotalCount int) ([]kueue.PodSet, error) {
+	podSets := make([]kueue.PodSet, 1)
+	for i, podInGroup := range p.list.Items {
+		if !isPodRunnableOrSucceeded(&podInGroup) {
+			continue
+		}
+
+		roleHash, err := getRoleHash(podInGroup)
+		if err != nil {
+			return nil, fmt.Errorf("failed to calculate pod role hash: %w", err)
+		}
+
+		podSet := FromObject(&podInGroup).PodSets()
+		podSet[0].Name = roleHash
+		podSet[0].Count = int32(groupTotalCount)
+		podSets[i] = podSet[0]
+		return podSets, nil
+	}
+
+	return nil, fmt.Errorf("failed to find a runnable pod in the group")
+}
+
 func constructGroupPodSets(pods []corev1.Pod) ([]kueue.PodSet, error) {
 	var resultPodSets []kueue.PodSet
 
@@ -713,8 +742,9 @@ func (p *Pod) validatePodGroupMetadata(r record.EventRecorder, activePods []core
 		return err
 	}
 	originalQueue := jobframework.QueueName(p)
+	_, useFastAdmission := p.pod.GetAnnotations()[GroupFastAdmissionAnnotation]
 
-	if len(activePods) < groupTotalCount {
+	if !useFastAdmission && len(activePods) < groupTotalCount {
 		errMsg := fmt.Sprintf("'%s' group has fewer runnable pods than expected", podGroupName(p.pod))
 		r.Eventf(p.Object(), corev1.EventTypeWarning, jobframework.ReasonErrWorkloadCompose, errMsg)
 		return jobframework.UnretryableError(errMsg)

pkg/controller/jobs/pod/pod_webhook.go

@@ -40,13 +40,14 @@ import (
 )
 
 const (
-	ManagedLabelKey            = constants.ManagedByKueueLabel
-	ManagedLabelValue          = "true"
-	PodFinalizer               = ManagedLabelKey
-	GroupNameLabel             = "kueue.x-k8s.io/pod-group-name"
-	GroupTotalCountAnnotation  = "kueue.x-k8s.io/pod-group-total-count"
-	RoleHashAnnotation         = "kueue.x-k8s.io/role-hash"
-	RetriableInGroupAnnotation = "kueue.x-k8s.io/retriable-in-group"
+	ManagedLabelKey              = constants.ManagedByKueueLabel
+	ManagedLabelValue            = "true"
+	PodFinalizer                 = ManagedLabelKey
+	GroupNameLabel               = "kueue.x-k8s.io/pod-group-name"
+	GroupTotalCountAnnotation    = "kueue.x-k8s.io/pod-group-total-count"
+	GroupFastAdmissionAnnotation = "kueue.x-k8s.io/pod-group-fast-admission"
+	RoleHashAnnotation           = "kueue.x-k8s.io/role-hash"
+	RetriableInGroupAnnotation   = "kueue.x-k8s.io/retriable-in-group"
 )
 
 var (

pkg/controller/jobs/statefulset/statefulset_webhook.go

@@ -80,9 +80,10 @@ func (wh *Webhook) Default(ctx context.Context, obj runtime.Object) error {
 	}
 	ss.Spec.Template.Labels[pod.GroupNameLabel] = podGroupName
 	if ss.Spec.Template.Annotations == nil {
-		ss.Spec.Template.Annotations = make(map[string]string, 1)
+		ss.Spec.Template.Annotations = make(map[string]string, 2)
 	}
 	ss.Spec.Template.Annotations[pod.GroupTotalCountAnnotation] = fmt.Sprint(podGroupReplicas)
+	ss.Spec.Template.Annotations[pod.GroupFastAdmissionAnnotation] = "true"
 
 	return nil
 }

pkg/util/testingjobs/statefulset/wrappers.go

@@ -132,3 +132,9 @@ func (ss *StatefulSetWrapper) PodTemplateSpecPodGroupNameLabel(
 func (ss *StatefulSetWrapper) PodTemplateSpecPodGroupTotalCountAnnotation(replicas int32) *StatefulSetWrapper {
 	return ss.PodTemplateSpecAnnotation(pod.GroupTotalCountAnnotation, fmt.Sprint(replicas))
 }
+
+func (ss *StatefulSetWrapper) Image(image string, args []string) *StatefulSetWrapper {
+	ss.Spec.Template.Spec.Containers[0].Image = image
+	ss.Spec.Template.Spec.Containers[0].Args = args
+	return ss
+}

test/e2e/config/common/controller_manager_config.yaml

@@ -27,3 +27,4 @@ integrations:
   - "kubeflow.org/tfjob"
   - "kubeflow.org/xgboostjob"
   - "pod"
+  - "statefulset"

test/e2e/singlecluster/statefulset_test.go

@@ -0,0 +1,85 @@
+package e2e
+
+import (
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
+	"sigs.k8s.io/kueue/pkg/util/kubeversion"
+	"sigs.k8s.io/kueue/pkg/util/testing"
+	statefulsettesting "sigs.k8s.io/kueue/pkg/util/testingjobs/statefulset"
+	"sigs.k8s.io/kueue/test/util"
+)
+
+var _ = ginkgo.Describe("Stateful set integration", func() {
+	var (
+		ns         *corev1.Namespace
+		onDemandRF *kueue.ResourceFlavor
+	)
+
+	ginkgo.BeforeEach(func() {
+		if kubeVersion().LessThan(kubeversion.KubeVersion1_27) {
+			ginkgo.Skip("Unsupported in versions older than 1.27")
+		}
+		ns = &corev1.Namespace{
+			ObjectMeta: metav1.ObjectMeta{
+				GenerateName: "pod-e2e-",
+			},
+		}
+		gomega.Expect(k8sClient.Create(ctx, ns)).To(gomega.Succeed())
+		onDemandRF = testing.MakeResourceFlavor("statefulset-resource-flavour").
+			NodeLabel("instance-type", "on-demand").
+			Obj()
+		gomega.Expect(k8sClient.Create(ctx, onDemandRF)).To(gomega.Succeed())
+	})
+	ginkgo.AfterEach(func() {
+		gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
+		util.ExpectObjectToBeDeleted(ctx, k8sClient, onDemandRF, true)
+	})
+
+	ginkgo.When("Single CQ", func() {
+		var (
+			cq *kueue.ClusterQueue
+			lq *kueue.LocalQueue
+		)
+
+		ginkgo.BeforeEach(func() {
+			cq = testing.MakeClusterQueue("statefulset-cluster-queue").
+				ResourceGroup(
+					*testing.MakeFlavorQuotas("statefulset-resource-flavour").
+						Resource(corev1.ResourceCPU, "5").
+						Obj(),
+				).
+				Preemption(kueue.ClusterQueuePreemption{
+					WithinClusterQueue: kueue.PreemptionPolicyLowerPriority,
+				}).
+				Obj()
+			gomega.Expect(k8sClient.Create(ctx, cq)).To(gomega.Succeed())
+			lq = testing.MakeLocalQueue("statefulset-local-queue", ns.Name).ClusterQueue(cq.Name).Obj()
+			gomega.Expect(k8sClient.Create(ctx, lq)).To(gomega.Succeed())
+		})
+		ginkgo.AfterEach(func() {
+			gomega.Expect(util.DeleteAllPodsInNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
+			util.ExpectObjectToBeDeleted(ctx, k8sClient, cq, true)
+		})
+
+		ginkgo.It("should admit group that fits", func() {
+			statefulSet := statefulsettesting.MakeStatefulSet("sf", ns.Name).
+				Image("gcr.io/k8s-staging-perf-tests/sleep:v0.1.0", []string{"1m"}).
+				Replicas(3).
+				Queue(lq.Name).
+				Obj()
+			gomega.Expect(k8sClient.Create(ctx, statefulSet)).To(gomega.Succeed())
+			gomega.Eventually(func(g gomega.Gomega) {
+				createdStatefulSet := &appsv1.StatefulSet{}
+				gomega.Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(statefulSet), createdStatefulSet)).
+					To(gomega.Succeed())
+				g.Expect(createdStatefulSet.Status.ReadyReplicas).To(gomega.Equal(int32(3)))
+			}).Should(gomega.Succeed())
+		})
+	})
+})

test/e2e/singlecluster/suite_test.go

@@ -63,5 +63,5 @@ var _ = ginkgo.BeforeSuite(func() {
 	waitForAvailableStart := time.Now()
 	util.WaitForKueueAvailability(ctx, k8sClient)
 	util.WaitForJobSetAvailability(ctx, k8sClient)
-	ginkgo.GinkgoLogr.Info("Kueue and JobSet oprators are available in the cluster", "waitingTime", time.Since(waitForAvailableStart))
+	ginkgo.GinkgoLogr.Info("Kueue and JobSet operators are available in the cluster", "waitingTime", time.Since(waitForAvailableStart))
 })

test/integration/controller/jobs/statefulset/suite_test.go

@@ -39,7 +39,6 @@ import (
 	"sigs.k8s.io/kueue/pkg/util/kubeversion"
 	"sigs.k8s.io/kueue/pkg/webhooks"
 	"sigs.k8s.io/kueue/test/integration/framework"
-	// +kubebuilder:scaffold:imports
 )
 
 var (