Merge pull request #9 from Vacant2333/remove-pod-group

chore: remove the pod group

Author: volcano-sh-bot

cmd/controller-manager/main.go

@@ -35,11 +35,8 @@ import (
 	"volcano.sh/volcano/pkg/version"
 
 	_ "volcano.sh/volcano/pkg/controllers/garbagecollector"
-	_ "volcano.sh/volcano/pkg/controllers/job"
-	_ "volcano.sh/volcano/pkg/controllers/podgroup"
 	_ "volcano.sh/volcano/pkg/controllers/queue"
 
-	_ "volcano.sh/volcano-global/pkg/controllers/deployment"
 	_ "volcano.sh/volcano-global/pkg/dispatcher"
 )
 

docs/deploy/README.md

@@ -126,7 +126,6 @@ the introduction of some `Volcano` CRDs to enable the **queue capability** for t
 
 Required `Volcano` CRD List:
 - batch.volcano.sh_jobs
-- scheduling.volcano.sh_podgroups
 - scheduling.volcano.sh_queues
 - bus.volcano.sh_commands
 
@@ -136,7 +135,6 @@ export KUBECONFIG=$HOME/.kube/karmada.config
 
 # Apply the required CRD to Karmada control plane.
 kubectl --context karmada-apiserver apply -f https://github.com/volcano-sh/volcano/raw/release-1.10/installer/helm/chart/volcano/crd/bases/batch.volcano.sh_jobs.yaml
-kubectl --context karmada-apiserver apply -f https://github.com/volcano-sh/volcano/raw/release-1.10/installer/helm/chart/volcano/crd/bases/scheduling.volcano.sh_podgroups.yaml
 kubectl --context karmada-apiserver apply -f https://github.com/volcano-sh/volcano/raw/release-1.10/installer/helm/chart/volcano/crd/bases/scheduling.volcano.sh_queues.yaml
 kubectl --context karmada-apiserver apply -f https://github.com/volcano-sh/volcano/raw/release-1.10/installer/helm/chart/volcano/crd/bases/bus.volcano.sh_commands.yaml
 ```

docs/deploy/exmaple/mindspore-cpu.yaml

@@ -15,7 +15,7 @@ spec:
   maxRetry: 5
   queue: default
   tasks:
-    - replicas: 8
+    - replicas: 2
       name: "pod"
       template:
         spec:
@@ -26,7 +26,7 @@ spec:
               name: mindspore-cpu-job
               resources:
                 limits:
-                  cpu: "0.1"
+                  cpu: "0.25"
                 requests:
-                  cpu: "0.1"
+                  cpu: "0.25"
           restartPolicy: OnFailure

pkg/controllers/deployment/deployment_controller.go

@@ -19,7 +19,6 @@ package api
 import (
 	workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
 	"k8s.io/apimachinery/pkg/types"
-	schedulingv1beta1 "volcano.sh/apis/pkg/apis/scheduling/v1beta1"
 )
 
 type DispatchStatus int16
@@ -31,23 +30,24 @@ const (
 )
 
 type ResourceBindingInfo struct {
-	ResourceBinding *workv1alpha2.ResourceBinding
-
-	ResourceUID types.UID
-	Queue       string
-	Priority    int32
-	PodGroup    *schedulingv1beta1.PodGroup
-
-	DispatchStatus DispatchStatus
+	ResourceBinding   *workv1alpha2.ResourceBinding
+	ResourceUID       types.UID
+	Queue             string
+	PriorityClassName string
+	DispatchStatus    DispatchStatus
+
+	// Update it when snapshot.
+	Priority int32
 }
 
 func (rbi *ResourceBindingInfo) DeepCopy() *ResourceBindingInfo {
 	return &ResourceBindingInfo{
-		ResourceBinding: rbi.ResourceBinding.DeepCopy(),
-		ResourceUID:     rbi.ResourceUID,
-		Queue:           rbi.Queue,
-		Priority:        rbi.Priority,
-		PodGroup:        rbi.PodGroup.DeepCopy(),
-		DispatchStatus:  rbi.DispatchStatus,
+		ResourceBinding:   rbi.ResourceBinding.DeepCopy(),
+		ResourceUID:       rbi.ResourceUID,
+		Queue:             rbi.Queue,
+		PriorityClassName: rbi.PriorityClassName,
+		DispatchStatus:    rbi.DispatchStatus,
+
+		Priority: rbi.Priority,
 	}
 }