remove ChildAdmissionController needed by Kueue 0.6 (#186)

Author: dgrove-oss

config/default/config.yaml

@@ -5,7 +5,6 @@ metadata:
 data:
   config.yaml: |
     appwrapper:
-      disableChildAdmissionCtrl: true
       enableKueueIntegrations: true
     controllerManager:
       health:

config/dev/config.yaml

@@ -5,8 +5,6 @@ metadata:
 data:
   config.yaml: |
     appwrapper:
-    appwrapper:
-      disableChildAdmissionCtrl: true
       enableKueueIntegrations: true
     controllerManager:
       health:

internal/controller/appwrapper/resource_management.go

@@ -31,7 +31,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/podset"
 	utilmaps "sigs.k8s.io/kueue/pkg/util/maps"
 )
@@ -82,13 +81,9 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *workload
 	if err != nil {
 		return err, true
 	}
-	if r.Config.EnableKueueIntegrations && !r.Config.DisableChildAdmissionCtrl {
-		obj.SetLabels(utilmaps.MergeKeepFirst(obj.GetLabels(), map[string]string{AppWrapperLabel: aw.Name, constants.QueueLabel: childJobQueueName}))
-	} else {
-		obj.SetLabels(utilmaps.MergeKeepFirst(obj.GetLabels(), map[string]string{AppWrapperLabel: aw.Name}))
-	}
-
 	awLabels := map[string]string{AppWrapperLabel: aw.Name}
+	obj.SetLabels(utilmaps.MergeKeepFirst(obj.GetLabels(), awLabels))
+
 	for podSetsIdx, podSet := range componentStatus.PodSets {
 		toInject := &workloadv1beta2.AppWrapperPodSetInfo{}
 		if r.Config.EnableKueueIntegrations {

internal/controller/workload/child_admission_controller.go

@@ -31,13 +31,12 @@ type OperatorConfig struct {
 }
 
 type AppWrapperConfig struct {
-	EnableKueueIntegrations   bool                  `json:"enableKueueIntegrations,omitempty"`
-	DisableChildAdmissionCtrl bool                  `json:"disableChildAdmissionCtrl,omitempty"`
-	KueueJobReconciller       *KueueJobReconciller  `json:"kueueJobReconciller,omitempty"`
-	UserRBACAdmissionCheck    bool                  `json:"userRBACAdmissionCheck,omitempty"`
-	FaultTolerance            *FaultToleranceConfig `json:"faultTolerance,omitempty"`
-	SchedulerName             string                `json:"schedulerName,omitempty"`
-	DefaultQueueName          string                `json:"defaultQueueName,omitempty"`
+	EnableKueueIntegrations bool                  `json:"enableKueueIntegrations,omitempty"`
+	KueueJobReconciller     *KueueJobReconciller  `json:"kueueJobReconciller,omitempty"`
+	UserRBACAdmissionCheck  bool                  `json:"userRBACAdmissionCheck,omitempty"`
+	FaultTolerance          *FaultToleranceConfig `json:"faultTolerance,omitempty"`
+	SchedulerName           string                `json:"schedulerName,omitempty"`
+	DefaultQueueName        string                `json:"defaultQueueName,omitempty"`
 }
 
 type KueueJobReconciller struct {
@@ -87,8 +86,7 @@ type HealthConfiguration struct {
 // NewAppWrapperConfig constructs an AppWrapperConfig and fills in default values
 func NewAppWrapperConfig() *AppWrapperConfig {
 	return &AppWrapperConfig{
-		EnableKueueIntegrations:   true,
-		DisableChildAdmissionCtrl: true,
+		EnableKueueIntegrations: true,
 		KueueJobReconciller: &KueueJobReconciller{
 			ManageJobsWithoutQueueName: true,
 			WaitForPodsReady:           &v1beta1.WaitForPodsReady{Enable: true},

pkg/config/config.go

@@ -48,15 +48,6 @@ func SetupControllers(mgr ctrl.Manager, awConfig *config.AppWrapperConfig) error
 		).SetupWithManager(mgr); err != nil {
 			return fmt.Errorf("workload controller: %w", err)
 		}
-
-		if !awConfig.DisableChildAdmissionCtrl {
-			if err := (&workload.ChildWorkloadReconciler{
-				Client: mgr.GetClient(),
-				Scheme: mgr.GetScheme(),
-			}).SetupWithManager(mgr); err != nil {
-				return fmt.Errorf("child admission controller: %w", err)
-			}
-		}
 	}
 
 	if err := (&appwrapper.AppWrapperReconciler{