move utils from internal to pkg (#63)

Author: dgrove-oss

internal/controller/appwrapper/appwrapper_controller.go

@@ -41,8 +41,8 @@ import (
 	utilmaps "sigs.k8s.io/kueue/pkg/util/maps"
 
 	workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
-	"github.com/project-codeflare/appwrapper/internal/utils"
 	"github.com/project-codeflare/appwrapper/pkg/config"
+	"github.com/project-codeflare/appwrapper/pkg/utils"
 )
 
 const (

internal/controller/appwrapper/appwrapper_controller_test.go

@@ -30,8 +30,8 @@ import (
 
 	workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 	"github.com/project-codeflare/appwrapper/internal/controller/workload"
-	"github.com/project-codeflare/appwrapper/internal/utils"
 	"github.com/project-codeflare/appwrapper/pkg/config"
+	"github.com/project-codeflare/appwrapper/pkg/utils"
 )
 
 var _ = Describe("AppWrapper Controller", func() {

internal/controller/workload/child_admission_controller.go

@@ -36,9 +36,7 @@ import (
 )
 
 const (
-	AppWrapperLabel     = "workload.codeflare.dev/appwrapper"
-	AppWrapperFinalizer = "workload.codeflare.dev/finalizer"
-	childJobQueueName   = "workload.codeflare.dev.admitted"
+	childJobQueueName = "workload.codeflare.dev.admitted"
 )
 
 // ChildWorkloadReconciler reconciles the admission status of an AppWrapper's child workloads
@@ -66,7 +64,7 @@ func (r *ChildWorkloadReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, nil
 	}
 
-	// One reason for not being Running but not PodsReady is that a child was suspended on creation by Kueue. Rectify that.
+	// One reason for being Running but not PodsReady is that a child was suspended on creation by Kueue. Rectify that.
 	if aw.Status.Phase == workloadv1beta2.AppWrapperRunning && !meta.IsStatusConditionTrue(aw.Status.Conditions, string(workloadv1beta2.PodsReady)) {
 		admittedChildren := 0
 		childrenWithPods := 0

internal/controller/workload/workload_controller.go

@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/kueue/pkg/podset"
 
 	workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
-	"github.com/project-codeflare/appwrapper/internal/utils"
+	"github.com/project-codeflare/appwrapper/pkg/utils"
 )
 
 // +kubebuilder:rbac:groups=scheduling.k8s.io,resources=priorityclasses,verbs=list;get;watch

internal/webhook/appwrapper_webhook.go

@@ -40,8 +40,8 @@ import (
 
 	workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 	wlc "github.com/project-codeflare/appwrapper/internal/controller/workload"
-	"github.com/project-codeflare/appwrapper/internal/utils"
 	"github.com/project-codeflare/appwrapper/pkg/config"
+	"github.com/project-codeflare/appwrapper/pkg/utils"
 )
 
 type AppWrapperWebhook struct {

internal/utils/utils.go renamed to pkg/utils/utils.go

@@ -41,7 +41,7 @@ import (
 
 	workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 	"github.com/project-codeflare/appwrapper/internal/controller/appwrapper"
-	"github.com/project-codeflare/appwrapper/internal/utils"
+	"github.com/project-codeflare/appwrapper/pkg/utils"
 )
 
 const (