project-codeflare · openshift-merge-robot · Aug 31, 2023 · Aug 21, 2023 · Aug 21, 2023 · Aug 31, 2023
diff --git a/Makefile b/Makefile
@@ -217,15 +217,15 @@ clean:
 #CRD file maintenance rules
 DEPLOYMENT_CRD_DIR=deployment/mcad-controller/crds
 CRD_BASE_DIR=config/crd/bases
-MCAD_CRDS= ${DEPLOYMENT_CRD_DIR}/ibm.com_quotasubtrees.yaml  \
-		   ${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_appwrappers.yaml \
-		   ${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_schedulingspecs.yaml
+MCAD_CRDS= ${DEPLOYMENT_CRD_DIR}/quota.codeflare.dev_quotasubtrees.yaml  \
+		   ${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_appwrappers.yaml \
+		   ${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_schedulingspecs.yaml
 
 update-deployment-crds: ${MCAD_CRDS}
 
-${DEPLOYMENT_CRD_DIR}/ibm.com_quotasubtrees.yaml : ${CRD_BASE_DIR}/ibm.com_quotasubtrees.yaml
-${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_appwrappers.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_appwrappers.yaml
-${DEPLOYMENT_CRD_DIR}/mcad.ibm.com_schedulingspecs.yaml : ${CRD_BASE_DIR}/mcad.ibm.com_schedulingspecs.yaml
+${DEPLOYMENT_CRD_DIR}/quota.codeflare.dev_quotasubtrees.yaml : ${CRD_BASE_DIR}/quota.codeflare.dev_quotasubtrees.yaml
+${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_appwrappers.yaml : ${CRD_BASE_DIR}/workload.codeflare.dev_appwrappers.yaml
+${DEPLOYMENT_CRD_DIR}/workload.codeflare.dev_schedulingspecs.yaml : ${CRD_BASE_DIR}/workload.codeflare.dev_schedulingspecs.yaml
 
 $(DEPLOYMENT_CRD_DIR)/%: ${CRD_BASE_DIR}/%
 	cp $< $@
diff --git a/config/crd/bases/ibm.com_quotasubtrees.yaml → ...es/quota.codeflare.dev_quotasubtrees.yaml b/config/crd/bases/ibm.com_quotasubtrees.yaml → ...es/quota.codeflare.dev_quotasubtrees.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: quotasubtrees.ibm.com
+  name: quotasubtrees.quota.codeflare.dev
 spec:
-  group: ibm.com
+  group: quota.codeflare.dev
   names:
     kind: QuotaSubtree
     listKind: QuotaSubtreeList

diff --git a/...roller/crds/mcad.ibm.com_appwrappers.yaml → ...s/workload.codeflare.dev_appwrappers.yaml b/...roller/crds/mcad.ibm.com_appwrappers.yaml → ...s/workload.codeflare.dev_appwrappers.yaml
diff --git a/...er/crds/mcad.ibm.com_schedulingspecs.yaml → ...rkload.codeflare.dev_schedulingspecs.yaml b/...er/crds/mcad.ibm.com_schedulingspecs.yaml → ...rkload.codeflare.dev_schedulingspecs.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: schedulingspecs.mcad.ibm.com
+  name: schedulingspecs.workload.codeflare.dev
 spec:
-  group: mcad.ibm.com
+  group: workload.codeflare.dev
   names:
     kind: SchedulingSpec
     listKind: SchedulingSpecList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - bases/ibm.com_quotasubtrees.yaml
-  - bases/mcad.ibm.com_appwrappers.yaml
-  - bases/mcad.ibm.com_schedulingspecs.yaml
+  - bases/quota.codeflare.dev_quotasubtrees.yaml
+  - bases/workload.codeflare.dev_appwrappers.yaml
+  - bases/workload.codeflare.dev_schedulingspecs.yaml
diff --git a/...ontroller/crds/ibm.com_quotasubtrees.yaml → ...ds/quota.codeflare.dev_quotasubtrees.yaml b/...ontroller/crds/ibm.com_quotasubtrees.yaml → ...ds/quota.codeflare.dev_quotasubtrees.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: quotasubtrees.ibm.com
+  name: quotasubtrees.quota.codeflare.dev
 spec:
-  group: ibm.com
+  group: quota.codeflare.dev
   names:
     kind: QuotaSubtree
     listKind: QuotaSubtreeList

diff --git a/...g/crd/bases/mcad.ibm.com_appwrappers.yaml → ...s/workload.codeflare.dev_appwrappers.yaml b/...g/crd/bases/mcad.ibm.com_appwrappers.yaml → ...s/workload.codeflare.dev_appwrappers.yaml
diff --git a/...d/bases/mcad.ibm.com_schedulingspecs.yaml → ...rkload.codeflare.dev_schedulingspecs.yaml b/...d/bases/mcad.ibm.com_schedulingspecs.yaml → ...rkload.codeflare.dev_schedulingspecs.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: schedulingspecs.mcad.ibm.com
+  name: schedulingspecs.workload.codeflare.dev
 spec:
-  group: mcad.ibm.com
+  group: workload.codeflare.dev
   names:
     kind: SchedulingSpec
     listKind: SchedulingSpecList

diff --git a/deployment/mcad-controller/templates/deployment.yaml b/deployment/mcad-controller/templates/deployment.yaml
@@ -110,8 +110,8 @@ metadata:
     kubernetes.io/bootstrapping: rbac-defaults
 rules:
 - apiGroups:
-  - mcad.ibm.com
-  - ibm.com
+  - quota.codeflare.dev
+  - workload.codeflare.dev
   resources:
   - xqueuejobs
   - queuejobs

diff --git a/doc/usage/aw-01.yaml b/doc/usage/aw-01.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: 0001-aw-generic-deployment-1

diff --git a/doc/usage/aw-02.yaml b/doc/usage/aw-02.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: 0002-aw-generic-deployment-2

diff --git a/doc/usage/examples/aw-1-k8s-job1.yaml b/doc/usage/examples/aw-1-k8s-job1.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-generic-statefulset-2

diff --git a/doc/usage/examples/aw-1-k8s-job2.yaml b/doc/usage/examples/aw-1-k8s-job2.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-generic-statefulset-2

diff --git a/doc/usage/examples/aw-1-k8s-job3.yaml b/doc/usage/examples/aw-1-k8s-job3.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-generic-statefulset-2

diff --git a/doc/usage/examples/kuberay/config/aw-kuberay-glue.yaml b/doc/usage/examples/kuberay/config/aw-kuberay-glue.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: raycluster-glue

diff --git a/doc/usage/examples/kuberay/config/aw-raycluster.yaml b/doc/usage/examples/kuberay/config/aw-raycluster.yaml
@@ -1,4 +1,4 @@
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: raycluster-autoscaler

diff --git a/doc/usage/examples/kuberay/config/xqueuejob-controller.yaml b/doc/usage/examples/kuberay/config/xqueuejob-controller.yaml
@@ -11,7 +11,7 @@ metadata:
   name: system:controller:xqueuejob-controller
 rules:
 - apiGroups:
-  - mcad.ibm.com
+  - workload.codeflare.dev
   resources:
   - xqueuejobs
   - queuejobs

diff --git a/doc/usage/quota_management/quickstart.md b/doc/usage/quota_management/quickstart.md
@@ -21,7 +21,7 @@ optimize resource utilization, avoid resource starvation, and ensure quality of
 ## Example QuotaSubtree
 
 ```yaml
-apiVersion: ibm.com/v1
+apiVersion: quota.codeflare.dev/v1
 kind: QuotaSubtree
 metadata:
   name: context-root
@@ -37,7 +37,7 @@ spec:
           cpu: 2000m
           memory: 8000Mi
 ---
-apiVersion: ibm.com/v1
+apiVersion: quota.codeflare.dev/v1
 kind: QuotaSubtree
 metadata:
   name: context-root-children
@@ -64,7 +64,7 @@ spec:
 ## Using quota trees in your AppWrappers
 
 ```yaml
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: myGangScheduledApp

diff --git a/doc/usage/tutorial.md b/doc/usage/tutorial.md
@@ -19,7 +19,7 @@ Refer to [deployment instructions](../deploy/deployment.md) on how to deploy the
 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:
 
 ```yaml
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   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
 Create an `AppWrapper` job in a file named `aw-02.yaml` with the following content:
 
 ```yaml
-apiVersion: mcad.ibm.com/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: 0002-aw-generic-deployment-2
@@ -312,7 +312,7 @@ Delete the first `AppWrapper` job.
 
 ```bash
 $ kubectl delete -f aw-01.yaml
-appwrapper.mcad.ibm.com "0001-aw-generic-deployment-1" deleted
+appwrapper.workload.codeflare.dev "0001-aw-generic-deployment-1" deleted
 ```
 
 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 --git a/pkg/apis/controller/v1beta1/doc.go b/pkg/apis/controller/v1beta1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +kubebuilder:object:generate=true
-// +groupName=mcad.ibm.com
+// +groupName=workload.codeflare.dev
 
 package v1beta1
diff --git a/pkg/apis/controller/v1beta1/register.go b/pkg/apis/controller/v1beta1/register.go
@@ -28,7 +28,7 @@ var (
 )
 
 // GroupName is the group name used in this package.
-const GroupName = "mcad.ibm.com"
+const GroupName = "workload.codeflare.dev"
 
 // SchemeGroupVersion is the group version used to register these objects.
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}

diff --git a/pkg/apis/quotaplugins/quotasubtree/v1/doc.go b/pkg/apis/quotaplugins/quotasubtree/v1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +kubebuilder:object:generate=true
-// +groupName=ibm.com
+// +groupName=quota.codeflare.dev
 
 package v1
diff --git a/pkg/apis/quotaplugins/quotasubtree/v1/register.go b/pkg/apis/quotaplugins/quotasubtree/v1/register.go
@@ -13,7 +13,7 @@ var (
 
 const (
 	// GroupName is the group name used in this package.
-	GroupName = "ibm.com"
+	GroupName = "quota.codeflare.dev"
 
 	// GroupVersion is the version of scheduling group
 	GroupVersion = "v1"

diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go