Skip to content

chore: remove the pod group #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
volcano-sh-bot merged 1 commit into from
Jan 14, 2025
Merged

chore: remove the pod group #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cmd/controller-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 0 additions & 2 deletions docs/deploy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
```
Expand Down
6 changes: 3 additions & 3 deletions docs/deploy/exmaple/mindspore-cpu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
maxRetry: 5
queue: default
tasks:
- replicas: 8
- replicas: 2
name: "pod"
template:
spec:
Expand All @@ -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
143 changes: 0 additions & 143 deletions pkg/controllers/deployment/deployment_controller.go
View file
Open in desktop

This file was deleted.

104 changes: 0 additions & 104 deletions pkg/controllers/deployment/deployment_controller_handlers.go
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions pkg/controllers/deployment/utils.go
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions pkg/dispatcher/api/resource_binding_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
}
}
Loading
⚡