Skip to content

Commit 8dad6d2

Browse files
committed
localqueue name should be a label (using an annotation is deprecated)
1 parent 802c322 commit 8dad6d2

File tree

9 files changed

+14
-11
lines changed

9 files changed

+14
-11
lines changed

samples/wrapped-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: workload.codeflare.dev/v1beta2
22
kind: AppWrapper
33
metadata:
44
name: sample-deployment
5-
annotations:
5+
labels:
66
kueue.x-k8s.io/queue-name: user-queue
77
spec:
88
components:

samples/wrapped-failing-job.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ apiVersion: workload.codeflare.dev/v1beta2
22
kind: AppWrapper
33
metadata:
44
name: sample-failing-job
5-
annotations:
5+
labels:
66
kueue.x-k8s.io/queue-name: user-queue
7+
annotations:
78
workload.codeflare.dev.appwrapper/failureGracePeriodDuration: 10s
89
workload.codeflare.dev.appwrapper/resetPauseDuration: 10s
910
workload.codeflare.dev.appwrapper/retryLimit: "3"

samples/wrapped-failing-pod.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ apiVersion: workload.codeflare.dev/v1beta2
22
kind: AppWrapper
33
metadata:
44
name: sample-failing-pod
5-
annotations:
5+
labels:
66
kueue.x-k8s.io/queue-name: user-queue
7+
annotations:
78
workload.codeflare.dev.appwrapper/failureGracePeriodDuration: 10s
89
workload.codeflare.dev.appwrapper/resetPauseDuration: 10s
910
workload.codeflare.dev.appwrapper/retryLimit: "1"

samples/wrapped-job.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ apiVersion: workload.codeflare.dev/v1beta2
22
kind: AppWrapper
33
metadata:
44
name: sample-job
5-
annotations:
5+
labels:
66
kueue.x-k8s.io/queue-name: user-queue
7+
annotations:
78
workload.codeflare.dev.appwrapper/successTTLDuration: "1m"
89
spec:
910
components:

samples/wrapped-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: workload.codeflare.dev/v1beta2
22
kind: AppWrapper
33
metadata:
44
name: sample-pod
5-
annotations:
5+
labels:
66
kueue.x-k8s.io/queue-name: user-queue
77
spec:
88
components:

samples/wrapped-pytorch-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: workload.codeflare.dev/v1beta2
22
kind: AppWrapper
33
metadata:
44
name: sample-pytorch-job
5-
annotations:
5+
labels:
66
kueue.x-k8s.io/queue-name: user-queue
77
spec:
88
components:

site/_pages/sample-batch-job.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: workload.codeflare.dev/v1beta2
1010
kind: AppWrapper
1111
metadata:
1212
name: sample-job
13-
annotations:
13+
labels:
1414
kueue.x-k8s.io/queue-name: user-queue
1515
spec:
1616
components:

site/_pages/sample-pytorch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: workload.codeflare.dev/v1beta2
1010
kind: AppWrapper
1111
metadata:
1212
name: sample-pytorch-job
13-
annotations:
13+
labels:
1414
kueue.x-k8s.io/queue-name: user-queue
1515
spec:
1616
components:

test/e2e/util_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ func toAppWrapper(components ...workloadv1beta2.AppWrapperComponent) *workloadv1
178178
return &workloadv1beta2.AppWrapper{
179179
TypeMeta: metav1.TypeMeta{APIVersion: workloadv1beta2.GroupVersion.String(), Kind: "AppWrapper"},
180180
ObjectMeta: metav1.ObjectMeta{
181-
Name: randName("aw"),
182-
Namespace: testNamespace,
183-
Annotations: map[string]string{kc.QueueLabel: testQueueName},
181+
Name: randName("aw"),
182+
Namespace: testNamespace,
183+
Labels: map[string]string{kc.QueueLabel: testQueueName},
184184
},
185185
Spec: workloadv1beta2.AppWrapperSpec{Components: components},
186186
}

0 commit comments

Comments
 (0)