Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
68188ac
feature: support resource reservation
LegGasai May 27, 2025
cb1dba0
merge
LegGasai May 27, 2025
9079cd8
bugfix: add prePredicate for reservation task to adapt volume bind
LegGasai May 28, 2025
24a6afb
merge
LegGasai May 28, 2025
a0bdf0a
merge
LegGasai Jun 1, 2025
71b87e9
move reservation context to ReservationContext
LegGasai Jun 1, 2025
fa4228b
optimize: remove reservation controller
LegGasai Jun 1, 2025
3f95f14
optimize: add TTL for Reservation
LegGasai Jun 1, 2025
0c6a59e
merge
LegGasai Jun 7, 2025
7aebf2e
Adapt to the change of moving the Reservation CRD from the batch API …
LegGasai Jun 8, 2025
8db0404
optimize: support multi optional reservation node.
LegGasai Jun 8, 2025
d1afec6
Refactor: Use PostBind to update Reservation
LegGasai Jun 22, 2025
a45c8eb
Merge remote-tracking branch 'upstream/master' into support_resource_…
LegGasai Jul 6, 2025
0bcc4f1
Optimize: Asynchronous processing for sync Reservation Status
LegGasai Jul 6, 2025
40983f0
Optimize: add reserve action
LegGasai Jul 21, 2025
0a48230
merge
LegGasai Jul 21, 2025
ccddf1a
merge
LegGasai Jul 21, 2025
793be7f
merge
LegGasai Jul 21, 2025
f28c882
merge
LegGasai Jul 21, 2025
44e538e
merge
LegGasai Jul 21, 2025
9824629
Merge remote-tracking branch 'upstream/master' into support_resource_…
LegGasai Jul 27, 2025
3cb4614
merge
LegGasai Aug 2, 2025
2060925
bugfix: skip update reservation-only pg in api server
LegGasai Aug 10, 2025
6131224
Merge remote-tracking branch 'upstream/master' into support_resource_…
LegGasai Aug 10, 2025
a7c0abe
bugfix: skip deleting reservation if already gc'ed
LegGasai Aug 10, 2025
d149b27
bugfix: fix action order in conf
LegGasai Aug 10, 2025
b9dfbfb
Merge remote-tracking branch 'upstream/master' into support_resource_…
LegGasai Sep 17, 2025
ed14208
chore: add sign off
LegGasai Sep 17, 2025
271f506
merge
LegGasai Oct 7, 2025
922b12a
merge
LegGasai Dec 28, 2025
d8340af
merge upstream and fix reservation bugs
LegGasai Dec 28, 2025
db6dfb9
fix reservation bugs
LegGasai Dec 28, 2025
f9b4708
type
LegGasai Dec 28, 2025
0dbc8e4
opt: Optimize code and add unit tests
LegGasai Jan 10, 2026
8af86fc
merge upstream
LegGasai Jan 10, 2026
f3c332c
merge upstream
LegGasai Jan 10, 2026
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ generate-code:
manifests: controller-gen
go mod vendor
# volcano crd base
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/volcano.sh/apis/pkg/apis/scheduling/v1beta1;./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/bus/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/nodeinfo/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/topology/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/shard/v1alpha1" output:crd:artifacts:config=config/crd/volcano/bases
$(CONTROLLER_GEN) $(CRD_OPTIONS_EXCLUDE_DESCRIPTION) paths="./vendor/volcano.sh/apis/pkg/apis/scheduling/v1beta1;./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/bus/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/nodeinfo/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/topology/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/shard/v1alpha1" output:crd:artifacts:config=config/crd/volcano/bases
# generate volcano job crd yaml without description to avoid yaml size limit when using `kubectl apply`
$(CONTROLLER_GEN) $(CRD_OPTIONS_EXCLUDE_DESCRIPTION) paths="./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1" output:crd:artifacts:config=config/crd/volcano/bases
# jobflow crd base
Expand Down
4 changes: 4 additions & 0 deletions config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ spec:
format: int32
minimum: 0
type: integer
reservationNodeNames:
items:
type: string
type: array
template:
properties:
metadata:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/jobflow/bases/flow.volcano.sh_jobtemplates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ spec:
format: int32
minimum: 0
type: integer
reservationNodeNames:
items:
type: string
type: array
template:
properties:
metadata:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/volcano/bases/batch.volcano.sh_cronjobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,10 @@ spec:
format: int32
minimum: 0
type: integer
reservationNodeNames:
items:
type: string
type: array
template:
properties:
metadata:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/volcano/bases/batch.volcano.sh_jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ spec:
format: int32
minimum: 0
type: integer
reservationNodeNames:
items:
type: string
type: array
template:
properties:
metadata:
Expand Down
37 changes: 0 additions & 37 deletions config/crd/volcano/bases/bus.volcano.sh_commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,69 +17,32 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Command defines command structure.
properties:
action:
description: Action defines the action that will be took to the target
object.
type: string
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
message:
description: Human-readable message indicating details of this command.
type: string
metadata:
type: object
reason:
description: Unique, one-word, CamelCase reason for this command.
type: string
target:
description: TargetObject defines the target object of this command.
properties:
apiVersion:
description: API version of the referent.
type: string
blockOwnerDeletion:
description: |-
If true, AND if the owner has the "foregroundDeletion" finalizer, then
the owner cannot be deleted from the key-value store until this
reference is removed.
See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion
for how the garbage collector interacts with this field and enforces the foreground deletion.
Defaults to false.
To set this field, a user needs "delete" permission of the owner,
otherwise 422 (Unprocessable Entity) will be returned.
type: boolean
controller:
description: If true, this reference points to the managing controller.
type: boolean
kind:
description: |-
Kind of the referent.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
name:
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
type: string
uid:
description: |-
UID of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids
type: string
required:
- apiVersion
Expand Down
26 changes: 0 additions & 26 deletions config/crd/volcano/bases/nodeinfo.volcano.sh_numatopologies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,17 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Numatopology is the Schema for the Numatopologies API
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: Specification of the numa information of the worker node
properties:
cpuDetail:
additionalProperties:
description: CPUInfo is the cpu topology detail
properties:
core:
minimum: 0
Expand All @@ -55,35 +41,23 @@ spec:
minimum: 0
type: integer
type: object
description: |-
Specifies the cpu topology info
Key is cpu id
type: object
numares:
additionalProperties:
description: ResourceInfo is the sets about resource capacity and
allocatable
properties:
allocatable:
type: string
capacity:
type: integer
type: object
description: |-
Specifies the numa info for the resource
Key is resource name
type: object
policies:
additionalProperties:
type: string
description: Specifies the policy of the manager
type: object
resReserved:
additionalProperties:
type: string
description: |-
Specifies the reserved resource of the node
Key is resource name
type: object
type: object
type: object
Expand Down
Loading