mirror of
https://github.com/hanzo-ml/trainer.git
synced 2026-09-24 00:31:34 +00:00
* feat: api for volcano scheduling plugin Signed-off-by: Xinmin Du <[email protected]> * feat: init volcano-plugin Signed-off-by: Xinmin Du <[email protected]> * feat: init test file Signed-off-by: Xinmin Du <[email protected]> * feat: register volcano plugin Signed-off-by: Xinmin Du <[email protected]> * feat: deal with minTaskMember, minMember, NetworkTopo Signed-off-by: Xinmin Du <[email protected]> * fix: calculate of minResource Signed-off-by: Xinmin Du <[email protected]> * test: build PodGroup test Signed-off-by: Xinmin Du <[email protected]> * refactor: separate to 2 prs(build&handler) Signed-off-by: Xinmin Du <[email protected]> * test: add test for new&reconcile_builder Signed-off-by: Xinmin Du <[email protected]> * fix: typo Signed-off-by: Xinmin Du <[email protected]> * fix: trainer/v2 import Signed-off-by: Xinmin Du <[email protected]> * fix: networktopo type Signed-off-by: Xinmin Du <[email protected]> * fix: OpenAPI validation errors Signed-off-by: Xinmin Du <[email protected]> * fix: remove minTaskMembers Signed-off-by: Xinmin Du <[email protected]> * test: test coverage 100% Signed-off-by: Xinmin Du <[email protected]> * feat: update apis Signed-off-by: Xinmin Du <[email protected]> * feat: replace testify Signed-off-by: Xinmin Du <[email protected]> * fix: registry Volcano CRDs to the scheme Signed-off-by: Xinmin Du <[email protected]> * fix: add volcano to scheme Signed-off-by: Xinmin Du <[email protected]> * fix: fix networktopo schema Signed-off-by: Xinmin Du <[email protected]> * fix: add networktopo spec in trainer Signed-off-by: Xinmin Du <[email protected]> * fix: unit test Signed-off-by: Xinmin Du <[email protected]> * feat: import networkTopo directly Signed-off-by: Xinmin Du <[email protected]> * fix: make generate Signed-off-by: Xinmin Du <[email protected]> * fix: make generate Signed-off-by: Xinmin Du <[email protected]> * fix: golangci-lint Signed-off-by: Xinmin Du <[email protected]> * fix: golangci-lint Signed-off-by: Xinmin Du <[email protected]> * feat: add volcano installation in integration test Signed-off-by: Xinmin Du <[email protected]> * fix: filter volcano api Signed-off-by: Xinmin Du <[email protected]> * fix: get volcano.podgroup with local version Signed-off-by: Xinmin Du <[email protected]> * fix: init test env with volcano podgroup installed Signed-off-by: Xinmin Du <[email protected]> * fix: check plugin in enforcePodgroupPolicy Signed-off-by: Xinmin Du <[email protected]> * fix: group-name label in unit test Signed-off-by: Xinmin Du <[email protected]> * fix: ReconcilerBuilders Signed-off-by: Xinmin Du <[email protected]> * feat: add PodGroupHandler Signed-off-by: Xinmin Du <[email protected]> * feat: unit test for handlers Signed-off-by: Xinmin Du <[email protected]> * fix: group name annotation Signed-off-by: Xinmin Du <[email protected]> * Update hack/swagger/main.go Co-authored-by: Andrey Velichkevich <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: no need to delete RBAC Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/volcano/indexer.go Co-authored-by: Andrey Velichkevich <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: nil checking for trainjob Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/volcano/volcano.go Co-authored-by: Andrey Velichkevich <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: make generate Signed-off-by: Xinmin Du <[email protected]> * fix: index conflict Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/coscheduling/coscheduling.go Co-authored-by: Shao Wang <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: update volcano to v1.12.2 Signed-off-by: Xinmin Du <[email protected]> * feat: re-use indexer Signed-off-by: Xinmin Du <[email protected]> * feat: add validate Signed-off-by: Xinmin Du <[email protected]> * fix: no scheduler when coscheduling is nil Signed-off-by: Xinmin Du <[email protected]> * fix: put group-name in annotations Signed-off-by: Xinmin Du <[email protected]> * feat: validate if priorityClass installed Signed-off-by: Xinmin Du <[email protected]> * feat: propagate annotations to pod Signed-off-by: Xinmin Du <[email protected]> * feat: integration test for volcano Signed-off-by: Xinmin Du <[email protected]> * fix: golangci-lint check Signed-off-by: Xinmin Du <[email protected]> * feat: use shared indexer Signed-off-by: Xinmin Du <[email protected]> * feat: remove indexer to runtime/ Signed-off-by: Xinmin Du <[email protected]> * Update hack/swagger/main.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * Update hack/swagger/main.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: append owner reference & missing import Signed-off-by: Xinmin Du <[email protected]> * fix: rewrite volcano UT Signed-off-by: Xinmin Du <[email protected]> * feat: add copyright Signed-off-by: Xinmin Du <[email protected]> * fix: sync RBAC to Helm charts Signed-off-by: Xinmin Du <[email protected]> * fix: refactor UTs Signed-off-by: Xinmin Du <[email protected]> * fix: test validation separately Signed-off-by: Xinmin Du <[email protected]> * Update hack/swagger/main.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: refactor TestVolcano Signed-off-by: Xinmin Du <[email protected]> * fix: refactor TestValidate Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/volcano/volcano_test.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> --------- Signed-off-by: Xinmin Du <[email protected]> Signed-off-by: Du Xinmin <[email protected]> Co-authored-by: Andrey Velichkevich <[email protected]> Co-authored-by: Shao Wang <[email protected]> Co-authored-by: Yuki Iwai <[email protected]>
100 lines
3.9 KiB
Bash
Executable File
100 lines
3.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Copyright 2024 The Kubeflow Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# This shell is used to auto generate some useful tools for k8s, such as clientset, lister, informer.
|
|
|
|
set -o errexit
|
|
set -o nounset
|
|
set -o pipefail
|
|
|
|
CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}")
|
|
TRAINER_ROOT=$(realpath "${CURRENT_DIR}/..")
|
|
TRAINER_PKG="github.com/kubeflow/trainer/v2"
|
|
|
|
cd "$CURRENT_DIR/.."
|
|
|
|
# Get the code-generator binary.
|
|
CODEGEN_PKG=$(go list -m -mod=readonly -f "{{.Dir}}" k8s.io/code-generator)
|
|
source "${CODEGEN_PKG}/kube_codegen.sh"
|
|
echo ">> Using ${CODEGEN_PKG}"
|
|
|
|
# Generating deepcopy and defaults.
|
|
echo "Generating deepcopy and defaults for Kubeflow Trainer"
|
|
kube::codegen::gen_helpers \
|
|
--boilerplate "${TRAINER_ROOT}/hack/boilerplate/boilerplate.go.txt" \
|
|
"${TRAINER_ROOT}/pkg/apis"
|
|
|
|
# Generate clients.
|
|
externals=(
|
|
"sigs.k8s.io/jobset/api/jobset/v1alpha2.JobSetSpec:sigs.k8s.io/jobset/client-go/applyconfiguration/jobset/v1alpha2"
|
|
"k8s.io/api/core/v1.EnvVar:k8s.io/client-go/applyconfigurations/core/v1"
|
|
"k8s.io/api/core/v1.EnvFromSource:k8s.io/client-go/applyconfigurations/core/v1"
|
|
"k8s.io/api/core/v1.ResourceRequirements:k8s.io/client-go/applyconfigurations/core/v1"
|
|
"k8s.io/api/core/v1.Toleration:k8s.io/client-go/applyconfigurations/core/v1"
|
|
"k8s.io/api/core/v1.Volume:k8s.io/client-go/applyconfigurations/core/v1"
|
|
"k8s.io/api/core/v1.VolumeMount:k8s.io/client-go/applyconfigurations/core/v1"
|
|
"k8s.io/api/autoscaling/v2.MetricSpec:k8s.io/client-go/applyconfigurations/autoscaling/v2"
|
|
"volcano.sh/apis/pkg/apis/scheduling/v1beta1.NetworkTopologySpec:volcano.sh/apis/pkg/client/applyconfiguration/scheduling/v1beta1"
|
|
)
|
|
|
|
apply_config_externals="${externals[0]}"
|
|
for external in "${externals[@]:1}"; do
|
|
apply_config_externals="${apply_config_externals},${external}"
|
|
done
|
|
|
|
echo "Generating clients for Kubeflow Trainer"
|
|
kube::codegen::gen_client \
|
|
--boilerplate "${TRAINER_ROOT}/hack/boilerplate/boilerplate.go.txt" \
|
|
--output-dir "${TRAINER_ROOT}/pkg/client" \
|
|
--output-pkg "${TRAINER_PKG}/pkg/client" \
|
|
--with-watch \
|
|
--with-applyconfig \
|
|
--applyconfig-externals "${apply_config_externals}" \
|
|
"${TRAINER_ROOT}/pkg/apis"
|
|
|
|
# Get the kube-openapi binary to generate OpenAPI spec.
|
|
OPENAPI_PKG=$(go list -m -mod=readonly -f "{{.Dir}}" k8s.io/kube-openapi)
|
|
echo ">> Using ${OPENAPI_PKG}"
|
|
|
|
echo "Generating OpenAPI specification for Kubeflow Trainer"
|
|
|
|
# This list needs to cover all of the types used transitively from the Kubeflow Trainer APIs.
|
|
# Update this list if Kubeflow Trainer depends on new external APIs.
|
|
EXTRA_PACKAGES=(
|
|
k8s.io/apimachinery/pkg/apis/meta/v1
|
|
k8s.io/apimachinery/pkg/api/resource
|
|
k8s.io/apimachinery/pkg/runtime
|
|
k8s.io/apimachinery/pkg/util/intstr
|
|
k8s.io/api/core/v1
|
|
k8s.io/api/autoscaling/v2
|
|
k8s.io/api/batch/v1
|
|
sigs.k8s.io/jobset/api/jobset/v1alpha2
|
|
volcano.sh/apis/pkg/apis/scheduling/v1beta1
|
|
)
|
|
|
|
go run ${OPENAPI_PKG}/cmd/openapi-gen \
|
|
--go-header-file "${TRAINER_ROOT}/hack/boilerplate/boilerplate.go.txt" \
|
|
--output-pkg "${TRAINER_PKG}/pkg/apis/trainer/v1alpha1" \
|
|
--output-dir "${TRAINER_ROOT}/pkg/apis/trainer/v1alpha1" \
|
|
--output-file "zz_generated.openapi.go" \
|
|
--report-filename "${TRAINER_ROOT}/hack/violation_exception_v1alpha1.list" \
|
|
"${EXTRA_PACKAGES[@]}" \
|
|
"${TRAINER_ROOT}/pkg/apis/trainer/v1alpha1"
|
|
|
|
# Generating OpenAPI Swagger for Kubeflow Trainer.
|
|
echo "Generate OpenAPI Swagger for Kubeflow Trainer"
|
|
go run hack/swagger/main.go >api/openapi-spec/swagger.json
|