Merge branch 'main' into codeflare-releases

Author: dgrove-oss

README.md

@@ -55,7 +55,7 @@ To install the latest release of AppWrapper in a Kubernetes cluster with Kueue a
 and configured, simply run the command:
 
 ```sh
-kubectl apply --server-side -f https://github.com/project-codeflare/appwrapper/releases/download/v0.28.0/install.yaml
+kubectl apply --server-side -f https://github.com/project-codeflare/appwrapper/releases/download/v0.29.0/install.yaml
 ```
 
 The controller runs in the `appwrapper-system` namespace.

api/v1beta2/appwrapper_types.go

@@ -179,7 +179,10 @@ const (
 	RetryableExitCodesAnnotation           = "workload.codeflare.dev.appwrapper/retryableExitCodes"
 )
 
-const AppWrapperControllerName = "workload.codeflare.dev/appwrapper-controller"
+const (
+	AppWrapperControllerName = "workload.codeflare.dev/appwrapper-controller"
+	AppWrapperLabel          = "workload.codeflare.dev/appwrapper"
+)
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status

docs/release_instructions.md

@@ -16,8 +16,10 @@ will:
    + create a [GitHub release](https://github.com/project-codeflare/appwrapper/releases) that contains the install.yaml
 
 4. To workaround back level go versions in ODH, we also maintain a
-   codeflare-releases branch.  After making a release, merge main into
-   the codeflare-releases branch and then tag it using a `cf` prefix
+   codeflare-releases branch.  After making a release, create a branch
+   from the codeflare-release branch, merge main into the branch and
+   then submit a PR against the codeflare-release branch.  After
+   CI passes, merge the PR and then tag the branch using a `cf` prefix
    instead of a `v`. (eg v0.21.2 ==> cf0.21.2).  After making this
    tag, you can update the codeflare-operator, using the vX.Y.Z tag in
    the Makefile and the cfX.Y.Z in the replace clause in codeflare's

internal/controller/appwrapper/appwrapper_controller.go

@@ -50,9 +50,7 @@ import (
 )
 
 const (
-	AppWrapperLabel     = "workload.codeflare.dev/appwrapper"
 	AppWrapperFinalizer = "workload.codeflare.dev/finalizer"
-	childJobQueueName   = "workload.codeflare.dev.admitted"
 )
 
 // AppWrapperReconciler reconciles an appwrapper
@@ -546,7 +544,7 @@ func (r *AppWrapperReconciler) getPodStatus(ctx context.Context, aw *workloadv1b
 	pods := &v1.PodList{}
 	if err := r.List(ctx, pods,
 		client.InNamespace(aw.Namespace),
-		client.MatchingLabels{AppWrapperLabel: aw.Name}); err != nil {
+		client.MatchingLabels{workloadv1beta2.AppWrapperLabel: aw.Name}); err != nil {
 		return nil, err
 	}
 	pc, err := utils.ExpectedPodCount(aw)
@@ -913,7 +911,7 @@ func clearCondition(aw *workloadv1beta2.AppWrapper, condition workloadv1beta2.Ap
 // podMapFunc maps pods to appwrappers and generates reconcile.Requests for those whose Status.Phase is PodSucceeded
 func (r *AppWrapperReconciler) podMapFunc(ctx context.Context, obj client.Object) []reconcile.Request {
 	pod := obj.(*v1.Pod)
-	if name, ok := pod.Labels[AppWrapperLabel]; ok {
+	if name, ok := pod.Labels[workloadv1beta2.AppWrapperLabel]; ok {
 		if pod.Status.Phase == v1.PodSucceeded {
 			return []reconcile.Request{{NamespacedName: types.NamespacedName{Namespace: pod.Namespace, Name: name}}}
 		}

internal/controller/appwrapper/appwrapper_controller_test.go

@@ -367,7 +367,7 @@ var _ = Describe("AppWrapper Controller", func() {
 
 		By("Validate expected markers and Autopilot anti-affinities were injected")
 		for _, p := range pods {
-			Expect(p.Labels).Should(HaveKeyWithValue(AppWrapperLabel, awName.Name))
+			Expect(p.Labels).Should(HaveKeyWithValue(workloadv1beta2.AppWrapperLabel, awName.Name))
 			validateMarkers(&p)
 			validateAutopilot(&p)
 		}
@@ -382,7 +382,7 @@ var _ = Describe("AppWrapper Controller", func() {
 
 		By("Validate expected markers and Autopilot anti-affinities were injected")
 		for _, p := range pods {
-			Expect(p.Labels).Should(HaveKeyWithValue(AppWrapperLabel, awName.Name))
+			Expect(p.Labels).Should(HaveKeyWithValue(workloadv1beta2.AppWrapperLabel, awName.Name))
 			validateMarkers(&p)
 			validateAutopilot(&p)
 		}

internal/controller/appwrapper/fixtures_test.go

@@ -75,7 +75,7 @@ func getPods(aw *workloadv1beta2.AppWrapper) []v1.Pod {
 	err := k8sClient.List(ctx, podList, &client.ListOptions{Namespace: aw.Namespace})
 	Expect(err).NotTo(HaveOccurred())
 	for _, pod := range podList.Items {
-		if awn, found := pod.Labels[AppWrapperLabel]; found && awn == aw.Name {
+		if awn, found := pod.Labels[workloadv1beta2.AppWrapperLabel]; found && awn == aw.Name {
 			result = append(result, pod)
 		}
 	}
@@ -93,7 +93,7 @@ func setPodStatus(aw *workloadv1beta2.AppWrapper, phase v1.PodPhase, numToChange
 		if numToChange <= 0 {
 			return nil
 		}
-		if awn, found := pod.Labels[AppWrapperLabel]; found && awn == aw.Name {
+		if awn, found := pod.Labels[workloadv1beta2.AppWrapperLabel]; found && awn == aw.Name {
 			pod.Status.Phase = phase
 			err = k8sClient.Status().Update(ctx, &pod)
 			if err != nil {

internal/controller/appwrapper/resource_management.go

@@ -197,7 +197,7 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *workload
 	if err != nil {
 		return err, true
 	}
-	awLabels := map[string]string{AppWrapperLabel: aw.Name}
+	awLabels := map[string]string{workloadv1beta2.AppWrapperLabel: aw.Name}
 	obj.SetLabels(utilmaps.MergeKeepFirst(obj.GetLabels(), awLabels))
 
 	for podSetsIdx, podSet := range componentStatus.PodSets {
@@ -411,7 +411,7 @@ func (r *AppWrapperReconciler) deleteComponents(ctx context.Context, aw *workloa
 	if err := r.List(ctx, pods,
 		client.UnsafeDisableDeepCopy,
 		client.InNamespace(aw.Namespace),
-		client.MatchingLabels{AppWrapperLabel: aw.Name}); err != nil {
+		client.MatchingLabels{workloadv1beta2.AppWrapperLabel: aw.Name}); err != nil {
 		log.FromContext(ctx).Error(err, "Pod list error")
 	}
 

site/_config.yml

@@ -25,7 +25,7 @@ repository: project-codeflare/appwrapper
 
 # Variables for use in pages
 gh_main_url: https://github.com/project-codeflare/appwrapper/blob/main
-appwrapper_version: v0.28.0
+appwrapper_version: v0.29.0
 
 # Outputting
 permalink: /:categories/:title/

test/e2e/util_test.go

@@ -41,7 +41,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
-	"github.com/project-codeflare/appwrapper/internal/controller/appwrapper"
 	"github.com/project-codeflare/appwrapper/pkg/utils"
 )
 
@@ -216,7 +215,7 @@ func getNodeForAppwrapper(ctx context.Context, awName types.NamespacedName) (str
 		return "", err
 	}
 	for _, pod := range podList.Items {
-		if awn, found := pod.Labels[appwrapper.AppWrapperLabel]; found && awn == awName.Name {
+		if awn, found := pod.Labels[workloadv1beta2.AppWrapperLabel]; found && awn == awName.Name {
 			return pod.Spec.NodeName, nil
 		}
 	}
@@ -249,7 +248,7 @@ func podsInPhase(awNamespace string, awName string, phase []v1.PodPhase, minimum
 
 		matchingPodCount := int32(0)
 		for _, pod := range podList.Items {
-			if awn, found := pod.Labels[appwrapper.AppWrapperLabel]; found && awn == awName {
+			if awn, found := pod.Labels[workloadv1beta2.AppWrapperLabel]; found && awn == awName {
 				for _, p := range phase {
 					if pod.Status.Phase == p {
 						matchingPodCount++
@@ -272,7 +271,7 @@ func noPodsExist(awNamespace string, awName string) wait.ConditionWithContextFun
 		}
 
 		for _, podFromPodList := range podList.Items {
-			if awn, found := podFromPodList.Labels[appwrapper.AppWrapperLabel]; found && awn == awName {
+			if awn, found := podFromPodList.Labels[workloadv1beta2.AppWrapperLabel]; found && awn == awName {
 				return false, nil
 			}
 		}