Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/wrapped-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion samples/wrapped-failing-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion samples/wrapped-failing-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion samples/wrapped-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion samples/wrapped-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion samples/wrapped-pytorch-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion site/_pages/sample-batch-job.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion site/_pages/sample-pytorch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/appwrapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
}
Expand Down