red-hat-data-services
diff --git a/‎Makefile‎
Lines changed: 10 additions & 1 deletion b/‎Makefile‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎api/openapi-spec/swagger.json‎
Lines changed: 44 additions & 0 deletions b/‎api/openapi-spec/swagger.json‎
Lines changed: 44 additions & 0 deletions
diff --git a/‎api/python_api/kubeflow_trainer_api/models/__init__.py‎
Lines changed: 2 additions & 0 deletions b/‎api/python_api/kubeflow_trainer_api/models/__init__.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎api/python_api/kubeflow_trainer_api/models/scheduling_v1beta1_network_topology_spec.py‎
Lines changed: 89 additions & 0 deletions b/‎api/python_api/kubeflow_trainer_api/models/scheduling_v1beta1_network_topology_spec.py‎
Lines changed: 89 additions & 0 deletions
diff --git a/‎api/python_api/kubeflow_trainer_api/models/trainer_v1alpha1_pod_group_policy.py‎
Lines changed: 8 additions & 2 deletions b/‎api/python_api/kubeflow_trainer_api/models/trainer_v1alpha1_pod_group_policy.py‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎api/python_api/kubeflow_trainer_api/models/trainer_v1alpha1_pod_group_policy_source.py‎
Lines changed: 8 additions & 2 deletions b/‎api/python_api/kubeflow_trainer_api/models/trainer_v1alpha1_pod_group_policy_source.py‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎api/python_api/kubeflow_trainer_api/models/trainer_v1alpha1_volcano_pod_group_policy_source.py‎
Lines changed: 91 additions & 0 deletions b/‎api/python_api/kubeflow_trainer_api/models/trainer_v1alpha1_volcano_pod_group_policy_source.py‎
Lines changed: 91 additions & 0 deletions
diff --git a/‎charts/kubeflow-trainer/crds/trainer.kubeflow.org_clustertrainingruntimes.yaml‎
Lines changed: 23 additions & 0 deletions b/‎charts/kubeflow-trainer/crds/trainer.kubeflow.org_clustertrainingruntimes.yaml‎
Lines changed: 23 additions & 0 deletions
@@ -111,6 +111,15 @@ scheduler-plugins-crd: ## Copy the CRDs from the Scheduler Plugins repository to
 	mkdir -p $(EXTERNAL_CRDS_DIR)/scheduler-plugins/
 	cp -f $(SCHEDULER_PLUGINS_ROOT)/manifests/coscheduling/* $(EXTERNAL_CRDS_DIR)/scheduler-plugins
 
+VOLCANO_APIS_ROOT = $(shell go list -m -f "{{.Dir}}" volcano.sh/apis)
+VOLCANO_VERSION = $(shell basename $(VOLCANO_APIS_ROOT) | cut -d'@' -f2)
+VOLCANO_CRD_URL = https://raw.githubusercontent.com/volcano-sh/volcano/$(VOLCANO_VERSION)/config/crd/volcano/bases/scheduling.volcano.sh_podgroups.yaml
+
+.PHONY: volcano-crd
+volcano-crd: ## Copy the CRDs from Volcano repository to the manifests/external-crds directory.
+	mkdir -p $(EXTERNAL_CRDS_DIR)/volcano/
+	curl -sSL $(VOLCANO_CRD_URL) -o $(EXTERNAL_CRDS_DIR)/volcano/scheduling.volcano.sh_podgroups.yaml
+
 # Instructions for code generation.
 .PHONY: manifests
 manifests: controller-gen ## Generate manifests.
@@ -155,7 +164,7 @@ test: ## Run Go unit test.
 	go test $(shell go list ./... | grep -Ev '/(test|cmd|hack|pkg/apis|pkg/client|pkg/util/testing)') -coverprofile cover.out
 
 .PHONY: test-integration
-test-integration: ginkgo envtest jobset-operator-crd scheduler-plugins-crd ## Run Go integration test.
+test-integration: ginkgo envtest jobset-operator-crd scheduler-plugins-crd volcano-crd ## Run Go integration test.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(K8S_VERSION) -p path)" $(GINKGO) -v ./test/integration/...
 
 .PHONY: test-python
 
@@ -627,6 +627,29 @@ spec:
                         format: int32
                         type: integer
                     type: object
+                  volcano:
+                    description: Volcano plugin for gang-scheduling.
+                    properties:
+                      networkTopology:
+                        description: NetworkTopology defines the NetworkTopology config,
+                          this field works in conjunction with network topology feature
+                          and hyperNode CRD.
+                        properties:
+                          highestTierAllowed:
+                            default: 1
+                            description: HighestTierAllowed specifies the highest
+                              tier that a job allowed to cross when scheduling.
+                            type: integer
+                          mode:
+                            default: hard
+                            description: Mode specifies the mode of the network topology
+                              constrain.
+                            enum:
+                            - hard
+                            - soft
+                            type: string
+                        type: object
+                    type: object
                 type: object
               template:
                 description: JobSet template which will be used by TrainJob.