Skip to content

Commit 7877b7b

Browse files
astefanuttiopenshift-merge-robot
astefanutti
authored and
openshift-merge-robot
committed
Move APIs to codeflare.dev groups
1 parent 7d2602e commit 7877b7b

File tree

118 files changed

+515
-994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+515
-994
lines changed

Diff for: ‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ clean:
217217
#CRD file maintenance rules
218218
DEPLOYMENT_CRD_DIR=deployment/mcad-controller/crds
219219
CRD_BASE_DIR=config/crd/bases
220-
MCAD_CRDS= ${DEPLOYMENT_CRD_DIR}/ibm.com_quotasubtrees.yaml \
221-
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_appwrappers.yaml \
222-
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_schedulingspecs.yaml
220+
MCAD_CRDS= ${DEPLOYMENT_CRD_DIR}/quota.codeflare.dev_quotasubtrees.yaml \
221+
${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_appwrappers.yaml \
222+
${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_schedulingspecs.yaml
223223

224224
update-deployment-crds: ${MCAD_CRDS}
225225

226-
${DEPLOYMENT_CRD_DIR}/ibm.com_quotasubtrees.yaml : ${CRD_BASE_DIR}/ibm.com_quotasubtrees.yaml
227-
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_appwrappers.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_appwrappers.yaml
228-
${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_schedulingspecs.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_schedulingspecs.yaml
226+
${DEPLOYMENT_CRD_DIR}/quota.codeflare.dev_quotasubtrees.yaml : ${CRD_BASE_DIR}/quota.codeflare.dev_quotasubtrees.yaml
227+
${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_appwrappers.yaml : ${CRD_BASE_DIR}/workload.codeflare.dev_appwrappers.yaml
228+
${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_schedulingspecs.yaml : ${CRD_BASE_DIR}/workload.codeflare.dev_schedulingspecs.yaml
229229

230230
$(DEPLOYMENT_CRD_DIR)/%: ${CRD_BASE_DIR}/%
231231
cp $< $@

Diff for: ‎config/crd/bases/ibm.com_quotasubtrees.yaml renamed to ‎config/crd/bases/quota.codeflare.dev_quotasubtrees.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
8-
name: quotasubtrees.ibm.com
8+
name: quotasubtrees.quota.codeflare.dev
99
spec:
10-
group: ibm.com
10+
group: quota.codeflare.dev
1111
names:
1212
kind: QuotaSubtree
1313
listKind: QuotaSubtreeList

Diff for: ‎deployment/mcad-controller/crds/mcad.ibm.com_appwrappers.yaml renamed to ‎config/crd/bases/workload.codeflare.dev_appwrappers.yaml

+83-66
Large diffs are not rendered by default.

Diff for: ‎deployment/mcad-controller/crds/mcad.ibm.com_schedulingspecs.yaml renamed to ‎config/crd/bases/workload.codeflare.dev_schedulingspecs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
8-
name: schedulingspecs.mcad.ibm.com
8+
name: schedulingspecs.workload.codeflare.dev
99
spec:
10-
group: mcad.ibm.com
10+
group: workload.codeflare.dev
1111
names:
1212
kind: SchedulingSpec
1313
listKind: SchedulingSpecList

Diff for: ‎config/crd/kustomization.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- bases/ibm.com_quotasubtrees.yaml
6-
- bases/mcad.ibm.com_appwrappers.yaml
7-
- bases/mcad.ibm.com_schedulingspecs.yaml
5+
- bases/quota.codeflare.dev_quotasubtrees.yaml
6+
- bases/workload.codeflare.dev_appwrappers.yaml
7+
- bases/workload.codeflare.dev_schedulingspecs.yaml

Diff for: ‎deployment/mcad-controller/crds/ibm.com_quotasubtrees.yaml renamed to ‎deployment/mcad-controller/crds/quota.codeflare.dev_quotasubtrees.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
8-
name: quotasubtrees.ibm.com
8+
name: quotasubtrees.quota.codeflare.dev
99
spec:
10-
group: ibm.com
10+
group: quota.codeflare.dev
1111
names:
1212
kind: QuotaSubtree
1313
listKind: QuotaSubtreeList

Diff for: ‎config/crd/bases/mcad.ibm.com_appwrappers.yaml renamed to ‎deployment/mcad-controller/crds/workload.codeflare.dev_appwrappers.yaml

+83-66
Large diffs are not rendered by default.

Diff for: ‎config/crd/bases/mcad.ibm.com_schedulingspecs.yaml renamed to ‎deployment/mcad-controller/crds/workload.codeflare.dev_schedulingspecs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
8-
name: schedulingspecs.mcad.ibm.com
8+
name: schedulingspecs.workload.codeflare.dev
99
spec:
10-
group: mcad.ibm.com
10+
group: workload.codeflare.dev
1111
names:
1212
kind: SchedulingSpec
1313
listKind: SchedulingSpecList

Diff for: ‎deployment/mcad-controller/templates/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ metadata:
110110
kubernetes.io/bootstrapping: rbac-defaults
111111
rules:
112112
- apiGroups:
113-
- mcad.ibm.com
114-
- ibm.com
113+
- quota.codeflare.dev
114+
- workload.codeflare.dev
115115
resources:
116116
- xqueuejobs
117117
- queuejobs

Diff for: ‎doc/usage/aw-01.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: 0001-aw-generic-deployment-1

Diff for: ‎doc/usage/aw-02.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: 0002-aw-generic-deployment-2

Diff for: ‎doc/usage/examples/aw-1-k8s-job1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: aw-generic-statefulset-2

Diff for: ‎doc/usage/examples/aw-1-k8s-job2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: aw-generic-statefulset-2

Diff for: ‎doc/usage/examples/aw-1-k8s-job3.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: aw-generic-statefulset-2

Diff for: ‎doc/usage/examples/kuberay/config/aw-kuberay-glue.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: raycluster-glue

Diff for: ‎doc/usage/examples/kuberay/config/aw-raycluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: raycluster-autoscaler

Diff for: ‎doc/usage/examples/kuberay/config/xqueuejob-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
name: system:controller:xqueuejob-controller
1212
rules:
1313
- apiGroups:
14-
- mcad.ibm.com
14+
- workload.codeflare.dev
1515
resources:
1616
- xqueuejobs
1717
- queuejobs

Diff for: ‎doc/usage/quota_management/quickstart.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ optimize resource utilization, avoid resource starvation, and ensure quality of
2121
## Example QuotaSubtree
2222

2323
```yaml
24-
apiVersion: ibm.com/v1
24+
apiVersion: quota.codeflare.dev/v1
2525
kind: QuotaSubtree
2626
metadata:
2727
name: context-root
@@ -37,7 +37,7 @@ spec:
3737
cpu: 2000m
3838
memory: 8000Mi
3939
---
40-
apiVersion: ibm.com/v1
40+
apiVersion: quota.codeflare.dev/v1
4141
kind: QuotaSubtree
4242
metadata:
4343
name: context-root-children
@@ -64,7 +64,7 @@ spec:
6464
## Using quota trees in your AppWrappers
6565
6666
```yaml
67-
apiVersion: mcad.ibm.com/v1beta1
67+
apiVersion: workload.codeflare.dev/v1beta1
6868
kind: AppWrapper
6969
metadata:
7070
name: myGangScheduledApp

Diff for: ‎doc/usage/tutorial.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Refer to [deployment instructions](../deploy/deployment.md) on how to deploy the
1919
After successfully deploying the __Multi-Cluster Application Dispatcher__ Controller, create an AppWrapper custom resource in a file named `aw-01.yaml` with the following content:
2020

2121
```yaml
22-
apiVersion: mcad.ibm.com/v1beta1
22+
apiVersion: workload.codeflare.dev/v1beta1
2323
kind: AppWrapper
2424
metadata:
2525
name: 0001-aw-generic-deployment-1
@@ -202,7 +202,7 @@ The next step is to create a second `AppWrapper` job that has resource demands t
202202
Create an `AppWrapper` job in a file named `aw-02.yaml` with the following content:
203203

204204
```yaml
205-
apiVersion: mcad.ibm.com/v1beta1
205+
apiVersion: workload.codeflare.dev/v1beta1
206206
kind: AppWrapper
207207
metadata:
208208
name: 0002-aw-generic-deployment-2
@@ -312,7 +312,7 @@ Delete the first `AppWrapper` job.
312312

313313
```bash
314314
$ kubectl delete -f aw-01.yaml
315-
appwrapper.mcad.ibm.com "0001-aw-generic-deployment-1" deleted
315+
appwrapper.workload.codeflare.dev "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.

Diff for: ‎pkg/apis/controller/v1beta1/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ limitations under the License.
1616

1717
// +k8s:deepcopy-gen=package
1818
// +kubebuilder:object:generate=true
19-
// +groupName=mcad.ibm.com
19+
// +groupName=workload.codeflare.dev
2020

2121
package v1beta1

Diff for: ‎pkg/apis/controller/v1beta1/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var (
2828
)
2929

3030
// GroupName is the group name used in this package.
31-
const GroupName = "mcad.ibm.com"
31+
const GroupName = "workload.codeflare.dev"
3232

3333
// SchemeGroupVersion is the group version used to register these objects.
3434
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}

Diff for: ‎pkg/apis/quotaplugins/quotasubtree/v1/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ limitations under the License.
1616

1717
// +k8s:deepcopy-gen=package
1818
// +kubebuilder:object:generate=true
19-
// +groupName=ibm.com
19+
// +groupName=quota.codeflare.dev
2020

2121
package v1

Diff for: ‎pkg/apis/quotaplugins/quotasubtree/v1/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var (
1313

1414
const (
1515
// GroupName is the group name used in this package.
16-
GroupName = "ibm.com"
16+
GroupName = "quota.codeflare.dev"
1717

1818
// GroupVersion is the version of scheduling group
1919
GroupVersion = "v1"

Diff for: ‎pkg/client/clientset/versioned/clientset.go

+18-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/client/clientset/versioned/fake/clientset_generated.go

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/client/clientset/versioned/fake/register.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/client/clientset/versioned/scheme/register.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)