Skip to content

Commit a24f2f9

Browse files
Fix label pattern to prefix/label-key: label-value
1 parent 9c3918e commit a24f2f9

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

pkg/controller/queuejobresources/genericresource/genericresource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
)
4545

4646
var appwrapperJobLabelName = "workload.codeflare.dev/appwrapper"
47-
var appwrapperJobLabelNamespace = "workload.codeflare.dev/appwrapper/namespace"
47+
var appwrapperJobLabelNamespace = "workload.codeflare.dev/appwrapper-namespace"
4848
var resourceName = "workload.codeflare.dev/resourceName"
4949
var appWrapperKind = arbv1.SchemeGroupVersion.WithKind("AppWrapper")
5050

test/e2e-kuttl-deployment-01/steps/01-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
labels:
1616
app: no-quota-deployment-01
1717
workload.codeflare.dev/appwrapper: no-quota-deployment-01
18-
workload.codeflare.dev/appwrapper/namespace: start-up
18+
workload.codeflare.dev/appwrapper-namespace: start-up
1919
workload.codeflare.dev/resourceName: no-quota-deployment-01
2020
status:
2121
availableReplicas: 1

test/e2e-kuttl-deployment-01/steps/03-assert.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
namespace: start-up
1414
labels:
1515
workload.codeflare.dev/appwrapper: hold-completion-job-03
16-
workload.codeflare.dev/appwrapper/namespace: start-up
16+
workload.codeflare.dev/appwrapper-namespace: start-up
1717
workload.codeflare.dev/resourceName: hold-completion-job-03-01
1818
status:
1919
conditions:
@@ -27,8 +27,8 @@ metadata:
2727
namespace: start-up
2828
labels:
2929
workload.codeflare.dev/appwrapper: hold-completion-job-03
30-
workload.codeflare.dev/appwrapper/namespace: start-up
31-
workload.codeflare.dev/job-name: hold-completion-job-03-01
30+
workload.codeflare.dev/appwrapper-namespace: start-up
31+
job-name: hold-completion-job-03-01
3232
workload.codeflare.dev/resourceName: hold-completion-job-03-01
3333
---
3434
apiVersion: v1
@@ -37,6 +37,6 @@ metadata:
3737
namespace: start-up
3838
labels:
3939
workload.codeflare.dev/appwrapper: hold-completion-job-03
40-
workload.codeflare.dev/appwrapper/namespace: start-up
41-
workload.codeflare.dev/job-name: hold-completion-job-03-02
40+
workload.codeflare.dev/appwrapper-namespace: start-up
41+
job-name: hold-completion-job-03-02
4242
workload.codeflare.dev/resourceName: hold-completion-job-03-02

test/e2e-kuttl-deployment-01/steps/07-assert.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ metadata:
1313
namespace: start-up
1414
labels:
1515
workload.codeflare.dev/appwrapper: no-quota-job-06
16-
workload.codeflare.dev/appwrapper/namespace: start-up
17-
workload.codeflare.dev/job-name: no-quota-job-06
16+
workload.codeflare.dev/appwrapper-namespace: start-up
17+
job-name: no-quota-job-06
1818
workload.codeflare.dev/resourceName: no-quota-job-06

test/e2e-kuttl-deployment-02/steps/02-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
labels:
1616
app: no-quota-deployment-02
1717
workload.codeflare.dev/appwrapper: no-quota-deployment-02
18-
workload.codeflare.dev/appwrapper/namespace: start-up-02
18+
workload.codeflare.dev/appwrapper-namespace: start-up-02
1919
workload.codeflare.dev/resourceName: no-quota-deployment-02
2020
status:
2121
availableReplicas: 1

test/e2e-kuttl-deployment-03/steps/02-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
labels:
1616
app: no-quota-deployment-02
1717
workload.codeflare.dev/appwrapper: no-quota-deployment-02
18-
workload.codeflare.dev/appwrapper/namespace: start-up-03
18+
workload.codeflare.dev/appwrapper-namespace: start-up-03
1919
workload.codeflare.dev/resourceName: no-quota-deployment-02
2020
status:
2121
availableReplicas: 1

test/e2e-kuttl/quota-errors/03-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ metadata:
1818
labels:
1919
app: deployment-silver-lo-pri-1replica
2020
workload.codeflare.dev/appwrapper: deployment-silver-lo-pri-1replica
21-
workload.codeflare.dev/appwrapper/namespace: quota-errors
21+
workload.codeflare.dev/appwrapper-namespace: quota-errors
2222
workload.codeflare.dev/resourceName: deployment-silver-lo-pri-1replica
2323
status:
2424
availableReplicas: 1

test/e2e/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ func createGenericServiceAWWithNoStatus(context *context, name string) *arbv1.Ap
15131513
"metadata": {
15141514
"labels": {
15151515
"workload.codeflare.dev/appwrapper": "test-dep-job-item",
1516-
"workload.codeflare.dev/appwrapper/namespace": "test",
1516+
"workload.codeflare.dev/appwrapper-namespace": "test",
15171517
"workload.codeflare.dev/resourceName": "test-dep-job-item-svc"
15181518
},
15191519
"name": "test-dep-job-item-svc",

0 commit comments

Comments
 (0)