Skip to content

Commit 396e9e2

Browse files
ChristianZaccariaChristianZaccaria
committed
Change label name to workload.codeflare.dev
1 parent 945df9d commit 396e9e2

33 files changed

+116
-116
lines changed

‎doc/usage/tutorial.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Delete the first `AppWrapper` job.
312312

313313
```bash
314314
$ kubectl delete -f aw-01.yaml
315-
appwrapper.workload.codeflare.dev "0001-aw-generic-deployment-1" deleted
315+
workload.codeflare.dev/appwrapper "0001-aw-generic-deployment-1" deleted
316316
```
317317

318318
Check the pods status of the `AppWrapper` jobs. The new pods from the second `AppWrapper` job: `0002-aw-generic-deployment-2` job should now be deployed and running.

‎pkg/apis/controller/v1beta1/appwrapper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const AppWrapperPlural string = "appwrappers"
2626

2727
// AppWrapperAnnotationKey is the annotation key of Pod to identify
2828
// which AppWrapper it belongs to.
29-
const AppWrapperAnnotationKey = "appwrapper.mcad.ibm.com/appwrapper-name"
29+
const AppWrapperAnnotationKey = "workload.codeflare.dev/appwrapper-name"
3030

3131
// +genclient
3232
// +kubebuilder:object:root=true

‎pkg/controller/queuejob/queuejob_controller_ex.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func GetQueueJobKey(obj interface{}) (string, error) {
144144
// UpdateQueueJobStatus was part of pod informer, this is now a method of queuejob_controller file.
145145
// This change is done in an effort to simplify the controller and enable to move to controller runtime.
146146
func (qjm *XController) UpdateQueueJobStatus(queuejob *arbv1.AppWrapper) error {
147-
labelSelector := fmt.Sprintf("%s=%s", "appwrapper.mcad.ibm.com", queuejob.Name)
147+
labelSelector := fmt.Sprintf("%s=%s", "workload.codeflare.dev/appwrapper", queuejob.Name)
148148
pods, errt := qjm.clients.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector})
149149
if errt != nil {
150150
return errt
@@ -209,7 +209,7 @@ func (qjm *XController) allocatableCapacity() *clusterstateapi.Resource {
209209
klog.Errorf("[allocatableCapacity] Error listing pods %v", err)
210210
}
211211
for _, pod := range podList.Items {
212-
if _, ok := pod.GetLabels()["appwrappers.mcad.ibm.com"]; !ok && pod.Status.Phase != v1.PodFailed && pod.Status.Phase != v1.PodSucceeded {
212+
if _, ok := pod.GetLabels()["workload.codeflare.dev/appwrappers"]; !ok && pod.Status.Phase != v1.PodFailed && pod.Status.Phase != v1.PodSucceeded {
213213
for _, container := range pod.Spec.Containers {
214214
usedResource := clusterstateapi.NewResource(container.Resources.Requests)
215215
capacity.Sub(usedResource)

‎pkg/controller/queuejobresources/genericresource/genericresource.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ import (
4343
"k8s.io/client-go/restmapper"
4444
)
4545

46-
var appwrapperJobLabelName = "appwrapper.mcad.ibm.com"
47-
var appwrapperJobLabelNamespace = "appwrapper.mcad.ibm.com/namespace"
48-
var resourceName = "resourceName"
46+
var appwrapperJobLabelName = "workload.codeflare.dev/appwrapper"
47+
var appwrapperJobLabelNamespace = "workload.codeflare.dev/appwrapper/namespace"
48+
var resourceName = "workload.codeflare.dev/resourceName"
4949
var appWrapperKind = arbv1.SchemeGroupVersion.WithKind("AppWrapper")
5050

5151
type GenericResources struct {

‎test/e2e-kuttl-borrowing/steps/03-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: my-job-1
3232
namespace: test
3333
labels:
34-
appwrapper.mcad.ibm.com: my-job-1
34+
workload.codeflare.dev/appwrapper: my-job-1
3535
spec:
3636
parallelism: 1
3737
completions: 1
@@ -40,7 +40,7 @@ spec:
4040
name: my-job-1
4141
namespace: test
4242
labels:
43-
appwrapper.mcad.ibm.com: my-job-1
43+
workload.codeflare.dev/appwrapper: my-job-1
4444
spec:
4545
terminationGracePeriodSeconds: 1
4646
restartPolicy: Never

‎test/e2e-kuttl-borrowing/steps/04-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: my-job-2
3232
namespace: test
3333
labels:
34-
appwrapper.mcad.ibm.com: my-job-2
34+
workload.codeflare.dev/appwrapper: my-job-2
3535
spec:
3636
parallelism: 1
3737
completions: 1
@@ -40,7 +40,7 @@ spec:
4040
name: my-job-2
4141
namespace: test
4242
labels:
43-
appwrapper.mcad.ibm.com: my-job-2
43+
workload.codeflare.dev/appwrapper: my-job-2
4444
spec:
4545
terminationGracePeriodSeconds: 1
4646
restartPolicy: Never

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ metadata:
1414
namespace: start-up
1515
labels:
1616
app: no-quota-deployment-01
17-
appwrapper.mcad.ibm.com: no-quota-deployment-01
18-
appwrapper.mcad.ibm.com/namespace: start-up
19-
resourceName: no-quota-deployment-01
17+
workload.codeflare.dev/appwrapper: no-quota-deployment-01
18+
workload.codeflare.dev/appwrapper/namespace: start-up
19+
workload.codeflare.dev/resourceName: no-quota-deployment-01
2020
status:
2121
availableReplicas: 1
2222
observedGeneration: 1

‎test/e2e-kuttl-deployment-01/steps/02-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
name: no-quota-job-02
2828
namespace: start-up
2929
labels:
30-
appwrapper.mcad.ibm.com: no-quota-job-02
30+
workload.codeflare.dev/appwrapper: no-quota-job-02
3131
spec:
3232
parallelism: 1
3333
completions: 1
@@ -36,7 +36,7 @@ spec:
3636
name: no-quota-job-1
3737
namespace: start-up
3838
labels:
39-
appwrapper.mcad.ibm.com: no-quota-job-02
39+
workload.codeflare.dev/appwrapper: no-quota-job-02
4040
spec:
4141
terminationGracePeriodSeconds: 1
4242
restartPolicy: Never

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ metadata:
1212
name: hold-completion-job-03-01
1313
namespace: start-up
1414
labels:
15-
appwrapper.mcad.ibm.com: hold-completion-job-03
16-
appwrapper.mcad.ibm.com/namespace: start-up
17-
resourceName: hold-completion-job-03-01
15+
workload.codeflare.dev/appwrapper: hold-completion-job-03
16+
workload.codeflare.dev/appwrapper/namespace: start-up
17+
workload.codeflare.dev/resourceName: hold-completion-job-03-01
1818
status:
1919
conditions:
2020
- status: "True"
@@ -26,17 +26,17 @@ kind: Pod
2626
metadata:
2727
namespace: start-up
2828
labels:
29-
appwrapper.mcad.ibm.com: hold-completion-job-03
30-
appwrapper.mcad.ibm.com/namespace: start-up
29+
workload.codeflare.dev/appwrapper: hold-completion-job-03
30+
workload.codeflare.dev/appwrapper/namespace: start-up
3131
job-name: hold-completion-job-03-01
32-
resourceName: hold-completion-job-03-01
32+
workload.codeflare.dev/resourceName: hold-completion-job-03-01
3333
---
3434
apiVersion: v1
3535
kind: Pod
3636
metadata:
3737
namespace: start-up
3838
labels:
39-
appwrapper.mcad.ibm.com: hold-completion-job-03
40-
appwrapper.mcad.ibm.com/namespace: start-up
39+
workload.codeflare.dev/appwrapper: hold-completion-job-03
40+
workload.codeflare.dev/appwrapper/namespace: start-up
4141
job-name: hold-completion-job-03-02
42-
resourceName: hold-completion-job-03-02
42+
workload.codeflare.dev/resourceName: hold-completion-job-03-02

‎test/e2e-kuttl-deployment-01/steps/03-install.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: hold-completion-job-03-01
3232
namespace: start-up
3333
labels:
34-
appwrapper.mcad.ibm.com: hold-completion-job-03
34+
workload.codeflare.dev/appwrapper: hold-completion-job-03
3535
spec:
3636
parallelism: 1
3737
completions: 1
@@ -40,7 +40,7 @@ spec:
4040
name: hold-completion-job-03-01
4141
namespace: start-up
4242
labels:
43-
appwrapper.mcad.ibm.com: hold-completion-job-03
43+
workload.codeflare.dev/appwrapper: hold-completion-job-03
4444
spec:
4545
terminationGracePeriodSeconds: 1
4646
restartPolicy: Never
@@ -80,7 +80,7 @@ spec:
8080
name: hold-completion-job-03-02
8181
namespace: start-up
8282
labels:
83-
appwrapper.mcad.ibm.com: hold-completion-job-03
83+
workload.codeflare.dev/appwrapper: hold-completion-job-03
8484
spec:
8585
parallelism: 1
8686
completions: 1
@@ -89,7 +89,7 @@ spec:
8989
name: hold-completion-job-03-02
9090
namespace: start-up
9191
labels:
92-
appwrapper.mcad.ibm.com: hold-completion-job-03
92+
workload.codeflare.dev/appwrapper: hold-completion-job-03
9393
spec:
9494
terminationGracePeriodSeconds: 1
9595
restartPolicy: Never

‎test/e2e-kuttl-deployment-01/steps/06-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: no-quota-job-06
3232
namespace: start-up
3333
labels:
34-
appwrapper.mcad.ibm.com: no-quota-job-06
34+
workload.codeflare.dev/appwrapper: no-quota-job-06
3535
spec:
3636
parallelism: 1
3737
completions: 1
@@ -40,7 +40,7 @@ spec:
4040
name: no-quota-job-06
4141
namespace: start-up
4242
labels:
43-
appwrapper.mcad.ibm.com: no-quota-job-06
43+
workload.codeflare.dev/appwrapper: no-quota-job-06
4444
spec:
4545
terminationGracePeriodSeconds: 1
4646
restartPolicy: Never

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ kind: Pod
1212
metadata:
1313
namespace: start-up
1414
labels:
15-
appwrapper.mcad.ibm.com: no-quota-job-06
16-
appwrapper.mcad.ibm.com/namespace: start-up
15+
workload.codeflare.dev/appwrapper: no-quota-job-06
16+
workload.codeflare.dev/appwrapper/namespace: start-up
1717
job-name: no-quota-job-06
18-
resourceName: no-quota-job-06
18+
workload.codeflare.dev/resourceName: no-quota-job-06

‎test/e2e-kuttl-deployment-01/steps/08-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
name: bronze-quota-job-08
3030
namespace: start-up
3131
labels:
32-
appwrapper.mcad.ibm.com: bronze-quota-job-08
32+
workload.codeflare.dev/appwrapper: bronze-quota-job-08
3333
spec:
3434
parallelism: 1
3535
completions: 1
@@ -38,7 +38,7 @@ spec:
3838
name: bronze-quota-job-08
3939
namespace: start-up
4040
labels:
41-
appwrapper.mcad.ibm.com: bronze-quota-job-08
41+
workload.codeflare.dev/appwrapper: bronze-quota-job-08
4242
spec:
4343
terminationGracePeriodSeconds: 1
4444
restartPolicy: Never

‎test/e2e-kuttl-deployment-02/steps/01-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
name: bronze-quota-job-01
3131
namespace: start-up-02
3232
labels:
33-
appwrapper.mcad.ibm.com: bronze-quota-job-01
33+
workload.codeflare.dev/appwrapper: bronze-quota-job-01
3434
spec:
3535
parallelism: 1
3636
completions: 1
@@ -39,7 +39,7 @@ spec:
3939
name: bronze-quota-job-01
4040
namespace: start-up-02
4141
labels:
42-
appwrapper.mcad.ibm.com: bronze-quota-job-01
42+
workload.codeflare.dev/appwrapper: bronze-quota-job-01
4343
spec:
4444
terminationGracePeriodSeconds: 1
4545
restartPolicy: Never

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ metadata:
1414
namespace: start-up-02
1515
labels:
1616
app: no-quota-deployment-02
17-
appwrapper.mcad.ibm.com: no-quota-deployment-02
18-
appwrapper.mcad.ibm.com/namespace: start-up-02
19-
resourceName: no-quota-deployment-02
17+
workload.codeflare.dev/appwrapper: no-quota-deployment-02
18+
workload.codeflare.dev/appwrapper/namespace: start-up-02
19+
workload.codeflare.dev/resourceName: no-quota-deployment-02
2020
status:
2121
availableReplicas: 1
2222
observedGeneration: 1

‎test/e2e-kuttl-deployment-02/steps/04-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
name: gold-quota-job-04
3131
namespace: start-up-02
3232
labels:
33-
appwrapper.mcad.ibm.com: gold-quota-job-04
33+
workload.codeflare.dev/appwrapper: gold-quota-job-04
3434
spec:
3535
parallelism: 1
3636
completions: 1
@@ -39,7 +39,7 @@ spec:
3939
name: gold-quota-job-04
4040
namespace: start-up-02
4141
labels:
42-
appwrapper.mcad.ibm.com: gold-quota-job-04
42+
workload.codeflare.dev/appwrapper: gold-quota-job-04
4343
spec:
4444
terminationGracePeriodSeconds: 1
4545
restartPolicy: Never

‎test/e2e-kuttl-deployment-03/steps/01-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
name: bronze-quota-job-01
3131
namespace: start-up-03
3232
labels:
33-
appwrapper.mcad.ibm.com: bronze-quota-job-01
33+
workload.codeflare.dev/appwrapper: bronze-quota-job-01
3434
spec:
3535
parallelism: 1
3636
completions: 1
@@ -39,7 +39,7 @@ spec:
3939
name: bronze-quota-job-01
4040
namespace: start-up-03
4141
labels:
42-
appwrapper.mcad.ibm.com: bronze-quota-job-01
42+
workload.codeflare.dev/appwrapper: bronze-quota-job-01
4343
spec:
4444
terminationGracePeriodSeconds: 1
4545
restartPolicy: Never

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ metadata:
1414
namespace: start-up-03
1515
labels:
1616
app: no-quota-deployment-02
17-
appwrapper.mcad.ibm.com: no-quota-deployment-02
18-
appwrapper.mcad.ibm.com/namespace: start-up-03
19-
resourceName: no-quota-deployment-02
17+
workload.codeflare.dev/appwrapper: no-quota-deployment-02
18+
workload.codeflare.dev/appwrapper/namespace: start-up-03
19+
workload.codeflare.dev/resourceName: no-quota-deployment-02
2020
status:
2121
availableReplicas: 1

‎test/e2e-kuttl-deployment-03/steps/04-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
name: gold-quota-job-04
3030
namespace: start-up-03
3131
labels:
32-
appwrapper.mcad.ibm.com: gold-quota-job-04
32+
workload.codeflare.dev/appwrapper: gold-quota-job-04
3333
spec:
3434
parallelism: 1
3535
completions: 1
@@ -38,7 +38,7 @@ spec:
3838
name: gold-quota-job-04
3939
namespace: start-up-03
4040
labels:
41-
appwrapper.mcad.ibm.com: gold-quota-job-04
41+
workload.codeflare.dev/appwrapper: gold-quota-job-04
4242
spec:
4343
terminationGracePeriodSeconds: 1
4444
restartPolicy: Never

‎test/e2e-kuttl-deployment-03/steps/05-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
name: plutonium-quota-job-05
3232
namespace: start-up-03
3333
labels:
34-
appwrapper.mcad.ibm.com: plutonium-quota-job-05
34+
workload.codeflare.dev/appwrapper: plutonium-quota-job-05
3535
spec:
3636
parallelism: 1
3737
completions: 1
@@ -40,7 +40,7 @@ spec:
4040
name: plutonium-quota-job-05
4141
namespace: start-up-03
4242
labels:
43-
appwrapper.mcad.ibm.com: plutonium-quota-job-05
43+
workload.codeflare.dev/appwrapper: plutonium-quota-job-05
4444
spec:
4545
terminationGracePeriodSeconds: 1
4646
restartPolicy: Never

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ metadata:
1717
namespace: quota-errors
1818
labels:
1919
app: deployment-silver-lo-pri-1replica
20-
appwrapper.mcad.ibm.com: deployment-silver-lo-pri-1replica
21-
appwrapper.mcad.ibm.com/namespace: quota-errors
22-
resourceName: deployment-silver-lo-pri-1replica
20+
workload.codeflare.dev/appwrapper: deployment-silver-lo-pri-1replica
21+
workload.codeflare.dev/appwrapper/namespace: quota-errors
22+
workload.codeflare.dev/resourceName: deployment-silver-lo-pri-1replica
2323
status:
2424
availableReplicas: 1
2525
observedGeneration: 1

‎test/e2e-kuttl/quota-forest/09-install.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
name: my-job-1
3737
namespace: test
3838
labels:
39-
appwrapper.mcad.ibm.com: my-job-1
39+
workload.codeflare.dev/appwrapper: my-job-1
4040
spec:
4141
parallelism: 1
4242
completions: 1
@@ -45,7 +45,7 @@ spec:
4545
name: my-job-1
4646
namespace: test
4747
labels:
48-
appwrapper.mcad.ibm.com: my-job-1
48+
workload.codeflare.dev/appwrapper: my-job-1
4949
spec:
5050
terminationGracePeriodSeconds: 1
5151
restartPolicy: Never
@@ -100,7 +100,7 @@ spec:
100100
name: my-job-2
101101
namespace: test
102102
labels:
103-
appwrapper.mcad.ibm.com: my-job-2
103+
workload.codeflare.dev/appwrapper: my-job-2
104104
spec:
105105
parallelism: 1
106106
completions: 1
@@ -109,7 +109,7 @@ spec:
109109
name: my-job-2
110110
namespace: test
111111
labels:
112-
appwrapper.mcad.ibm.com: my-job-2
112+
workload.codeflare.dev/appwrapper: my-job-2
113113
spec:
114114
terminationGracePeriodSeconds: 1
115115
restartPolicy: Never

0 commit comments

Comments
 (0)