localqueue name should be a label (using an annotation is deprecated) (#125)

Author: dgrove-oss

samples/wrapped-deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-deployment
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
 spec:
   components:

samples/wrapped-failing-job.yaml

@@ -2,8 +2,9 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-failing-job
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
+  annotations:
     workload.codeflare.dev.appwrapper/failureGracePeriodDuration: 10s
     workload.codeflare.dev.appwrapper/resetPauseDuration: 10s
     workload.codeflare.dev.appwrapper/retryLimit: "3"

samples/wrapped-failing-pod.yaml

@@ -2,8 +2,9 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-failing-pod
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
+  annotations:
     workload.codeflare.dev.appwrapper/failureGracePeriodDuration: 10s
     workload.codeflare.dev.appwrapper/resetPauseDuration: 10s
     workload.codeflare.dev.appwrapper/retryLimit: "1"

samples/wrapped-job.yaml

@@ -2,8 +2,9 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-job
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
+  annotations:
     workload.codeflare.dev.appwrapper/successTTLDuration: "1m"
 spec:
   components:

samples/wrapped-pod.yaml

@@ -2,7 +2,7 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-pod
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
 spec:
   components:

samples/wrapped-pytorch-job.yaml

@@ -2,7 +2,7 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-pytorch-job
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
 spec:
   components:

site/_pages/sample-batch-job.md

@@ -10,7 +10,7 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-job
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
 spec:
   components:

site/_pages/sample-pytorch.md

@@ -10,7 +10,7 @@ apiVersion: workload.codeflare.dev/v1beta2
 kind: AppWrapper
 metadata:
   name: sample-pytorch-job
-  annotations:
+  labels:
     kueue.x-k8s.io/queue-name: user-queue
 spec:
   components:

test/e2e/appwrapper_test.go

@@ -266,6 +266,9 @@ var _ = Describe("AppWrapper E2E Test", func() {
 
 		It("A failed Batch Job yields a failed AppWrapper", func() {
 			aw := toAppWrapper(failingBatchjob(500))
+			if aw.Annotations == nil {
+				aw.Annotations = make(map[string]string)
+			}
 			aw.Annotations[workloadv1beta2.FailureGracePeriodDurationAnnotation] = "0s"
 			aw.Annotations[workloadv1beta2.RetryLimitAnnotation] = "0"
 			Expect(getClient(ctx).Create(ctx, aw)).To(Succeed())

test/e2e/util_test.go

@@ -178,9 +178,9 @@ func toAppWrapper(components ...workloadv1beta2.AppWrapperComponent) *workloadv1
 	return &workloadv1beta2.AppWrapper{
 		TypeMeta: metav1.TypeMeta{APIVersion: workloadv1beta2.GroupVersion.String(), Kind: "AppWrapper"},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        randName("aw"),
-			Namespace:   testNamespace,
-			Annotations: map[string]string{kc.QueueLabel: testQueueName},
+			Name:      randName("aw"),
+			Namespace: testNamespace,
+			Labels:    map[string]string{kc.QueueLabel: testQueueName},
 		},
 		Spec: workloadv1beta2.AppWrapperSpec{Components: components},
 	}