AppWrapper configuration (#24)

Put AppWrapper configuration into a struct to be closer
to conformance with ADR-0007 (struct is not yet in api package).

Author: dgrove-oss

cmd/main.go

@@ -62,6 +62,9 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+
+	config := controller.AppWrapperConfig{}
+
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
@@ -71,6 +74,7 @@ func main() {
 		"If set the metrics endpoint is served securely")
 	flag.BoolVar(&enableHTTP2, "enable-http2", false,
 		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
+	flag.BoolVar(&config.ManageJobsWithoutQueueName, "manage-no-queue", true, "Manage AppWrappers without queue names")
 	opts := zap.Options{
 		Development: true,
 	}
@@ -131,6 +135,7 @@ func main() {
 	if err := controller.WorkloadReconciler(
 		mgr.GetClient(),
 		mgr.GetEventRecorderFor("kueue"),
+		jobframework.WithManageJobsWithoutQueueName(config.ManageJobsWithoutQueueName),
 	).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "Unable to create controller", "controller", "Workload")
 		os.Exit(1)
@@ -139,13 +144,13 @@ func main() {
 	if err = (&controller.AppWrapperReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
+		Config: &config,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "AppWrapper")
 		os.Exit(1)
 	}
 	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
-		// TODO: Proper configuration of ManageJobsWithoutQueueName via config file
-		wh := &controller.AppWrapperWebhook{ManageJobsWithoutQueueName: true}
+		wh := &controller.AppWrapperWebhook{Config: &config}
 		if err := ctrl.NewWebhookManagedBy(mgr).
 			For(&workloadv1beta2.AppWrapper{}).
 			WithDefaulter(wh).

internal/controller/appwrapper_controller.go

@@ -47,6 +47,7 @@ const (
 type AppWrapperReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
+	Config *AppWrapperConfig
 }
 
 type podStatusSummary struct {

internal/controller/appwrapper_webhook.go

@@ -30,7 +30,7 @@ import (
 )
 
 type AppWrapperWebhook struct {
-	ManageJobsWithoutQueueName bool
+	Config *AppWrapperConfig
 }
 
 //+kubebuilder:webhook:path=/mutate-workload-codeflare-dev-v1beta2-appwrapper,mutating=true,failurePolicy=fail,sideEffects=None,groups=workload.codeflare.dev,resources=appwrappers,verbs=create,versions=v1beta2,name=mappwrapper.kb.io,admissionReviewVersions=v1
@@ -41,7 +41,7 @@ var _ webhook.CustomDefaulter = &AppWrapperWebhook{}
 func (w *AppWrapperWebhook) Default(ctx context.Context, obj runtime.Object) error {
 	aw := obj.(*workloadv1beta2.AppWrapper)
 	log.FromContext(ctx).Info("Applying defaults", "job", aw)
-	jobframework.ApplyDefaultForSuspend((*AppWrapper)(aw), w.ManageJobsWithoutQueueName)
+	jobframework.ApplyDefaultForSuspend((*AppWrapper)(aw), w.Config.ManageJobsWithoutQueueName)
 	return nil
 }
 
@@ -56,7 +56,7 @@ func (w *AppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Obje
 
 	allErrors := w.validateAppWrapperInvariants(ctx, aw)
 
-	if w.ManageJobsWithoutQueueName || jobframework.QueueName((*AppWrapper)(aw)) != "" {
+	if w.Config.ManageJobsWithoutQueueName || jobframework.QueueName((*AppWrapper)(aw)) != "" {
 		allErrors = append(allErrors, jobframework.ValidateCreateForQueueName((*AppWrapper)(aw))...)
 	}
 
@@ -71,7 +71,7 @@ func (w *AppWrapperWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj r
 
 	allErrors := w.validateAppWrapperInvariants(ctx, newAW)
 
-	if w.ManageJobsWithoutQueueName || jobframework.QueueName((*AppWrapper)(newAW)) != "" {
+	if w.Config.ManageJobsWithoutQueueName || jobframework.QueueName((*AppWrapper)(newAW)) != "" {
 		allErrors = append(allErrors, jobframework.ValidateUpdateForQueueName((*AppWrapper)(oldAW), (*AppWrapper)(newAW))...)
 		allErrors = append(allErrors, jobframework.ValidateUpdateForWorkloadPriorityClassName((*AppWrapper)(oldAW), (*AppWrapper)(newAW))...)
 	}

internal/controller/confg.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2024 IBM Corporation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package controller
+
+type AppWrapperConfig struct {
+	ManageJobsWithoutQueueName bool `json:"manageJobsWithoutQueueName,omitempty"`
+}