mirror of
https://github.com/hanzo-ml/kuberay.git
synced 2026-10-30 19:48:47 +00:00
* [RayJob][Fix] Use --no-wait for job submission to avoid carrying the error return code to the log tailing (#3216) * [RayJob][Fix] Use --no-wait for job submission to avoid carrying the error return code to the log tailing Signed-off-by: Rueian <[email protected]> * [RayJob][Fix] Use --no-wait for job submission to avoid carrying the error return code to the log tailing Signed-off-by: Rueian <[email protected]> * chore: update comments Signed-off-by: Rueian <[email protected]> * chore: add a comment about bash -e Signed-off-by: Rueian <[email protected]> --------- Signed-off-by: Rueian <[email protected]> * kubectl ray job submit: provide entrypoint (#3186) * [kubectl-plugin] Add head/worker node selector option (#3228) * add node selector option for kubectl plugin create cluster Signed-off-by: Troy Chiu <[email protected]> * nit Signed-off-by: Troy Chiu <[email protected]> --------- Signed-off-by: Troy Chiu <[email protected]> * add node selector option for kubectl plugin create worker group (#3235) * add node selector option for kubectl plugin create work group Signed-off-by: Troy Chiu <[email protected]> * nit Signed-off-by: Troy Chiu <[email protected]> * code review: fix usage Signed-off-by: Troy Chiu <[email protected]> --------- Signed-off-by: Troy Chiu <[email protected]> * [kubectl-plugin] remove CPU limits by default (#3243) Signed-off-by: Andrew Sy Kim <[email protected]> * [Chore][CI] Limit the release-image-build github workflow to only take tag as input (#3117) * remove all inputs from workflow_dispatch Signed-off-by: Tina Wu <[email protected]> * use tag only Signed-off-by: Tina Wu <[email protected]> * align case Signed-off-by: Tina Wu <[email protected]> * change sha Signed-off-by: Tina Wu <[email protected]> * extract tag * lint fix Signed-off-by: Tina Wu <[email protected]> * update github_env Signed-off-by: Tina Wu <[email protected]> * directly take tag Signed-off-by: Tina Wu <[email protected]> * add env, Signed-off-by: Tina Wu <[email protected]> * directly use tag Signed-off-by: Tina Wu <[email protected]> * use env. when in script Signed-off-by: Tina Wu <[email protected]> * env.tag when with Signed-off-by: Tina Wu <[email protected]> * use env.tag for all Signed-off-by: Tina Wu <[email protected]> --------- Signed-off-by: Tina Wu <[email protected]> Co-authored-by: tinaxfwu <[email protected]> * [CI] Remove create tag step from release (#3249) Signed-off-by: Chi-Sheng Liu <[email protected]> --------- Signed-off-by: Rueian <[email protected]> Signed-off-by: Troy Chiu <[email protected]> Signed-off-by: Andrew Sy Kim <[email protected]> Signed-off-by: Tina Wu <[email protected]> Signed-off-by: Chi-Sheng Liu <[email protected]> Co-authored-by: Rueian <[email protected]> Co-authored-by: Spencer Peterson <[email protected]> Co-authored-by: Troy Chiu <[email protected]> Co-authored-by: Tina Wu <[email protected]> Co-authored-by: tinaxfwu <[email protected]> Co-authored-by: Chi-Sheng Liu <[email protected]>
162 lines
6.4 KiB
Go
162 lines
6.4 KiB
Go
package generation
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/api/resource"
|
|
|
|
"github.com/ray-project/kuberay/kubectl-plugin/pkg/util"
|
|
|
|
rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
|
|
)
|
|
|
|
func TestGenerateRayCluterApplyConfig(t *testing.T) {
|
|
testRayClusterYamlObject := RayClusterYamlObject{
|
|
ClusterName: "test-ray-cluster",
|
|
Namespace: "default",
|
|
RayClusterSpecObject: RayClusterSpecObject{
|
|
RayVersion: util.RayVersion,
|
|
Image: util.RayImage,
|
|
HeadCPU: "1",
|
|
HeadMemory: "5Gi",
|
|
HeadGPU: "1",
|
|
WorkerReplicas: 3,
|
|
WorkerCPU: "2",
|
|
WorkerMemory: "10Gi",
|
|
WorkerGPU: "1",
|
|
HeadNodeSelectors: map[string]string{
|
|
"head-selector1": "foo",
|
|
},
|
|
WorkerNodeSelectors: map[string]string{
|
|
"worker-selector1": "baz",
|
|
},
|
|
},
|
|
}
|
|
|
|
result := testRayClusterYamlObject.GenerateRayClusterApplyConfig()
|
|
|
|
assert.Equal(t, testRayClusterYamlObject.ClusterName, *result.Name)
|
|
assert.Equal(t, testRayClusterYamlObject.Namespace, *result.Namespace)
|
|
assert.Equal(t, testRayClusterYamlObject.RayVersion, *result.Spec.RayVersion)
|
|
assert.Equal(t, testRayClusterYamlObject.Image, *result.Spec.HeadGroupSpec.Template.Spec.Containers[0].Image)
|
|
assert.Equal(t, resource.MustParse(testRayClusterYamlObject.HeadCPU), *result.Spec.HeadGroupSpec.Template.Spec.Containers[0].Resources.Requests.Cpu())
|
|
assert.Equal(t, resource.MustParse(testRayClusterYamlObject.HeadGPU), *result.Spec.HeadGroupSpec.Template.Spec.Containers[0].Resources.Requests.Name(corev1.ResourceName("nvidia.com/gpu"), resource.DecimalSI))
|
|
assert.Equal(t, resource.MustParse(testRayClusterYamlObject.HeadMemory), *result.Spec.HeadGroupSpec.Template.Spec.Containers[0].Resources.Requests.Memory())
|
|
assert.Equal(t, "default-group", *result.Spec.WorkerGroupSpecs[0].GroupName)
|
|
assert.Equal(t, testRayClusterYamlObject.WorkerReplicas, *result.Spec.WorkerGroupSpecs[0].Replicas)
|
|
assert.Equal(t, resource.MustParse(testRayClusterYamlObject.WorkerCPU), *result.Spec.WorkerGroupSpecs[0].Template.Spec.Containers[0].Resources.Requests.Cpu())
|
|
assert.Equal(t, resource.MustParse(testRayClusterYamlObject.WorkerGPU), *result.Spec.WorkerGroupSpecs[0].Template.Spec.Containers[0].Resources.Requests.Name(corev1.ResourceName("nvidia.com/gpu"), resource.DecimalSI))
|
|
assert.Equal(t, resource.MustParse(testRayClusterYamlObject.WorkerMemory), *result.Spec.WorkerGroupSpecs[0].Template.Spec.Containers[0].Resources.Requests.Memory())
|
|
assert.Equal(t, testRayClusterYamlObject.HeadNodeSelectors, result.Spec.HeadGroupSpec.Template.Spec.NodeSelector)
|
|
assert.Equal(t, testRayClusterYamlObject.WorkerNodeSelectors, result.Spec.WorkerGroupSpecs[0].Template.Spec.NodeSelector)
|
|
}
|
|
|
|
func TestGenerateRayJobApplyConfig(t *testing.T) {
|
|
testRayJobYamlObject := RayJobYamlObject{
|
|
RayJobName: "test-ray-job",
|
|
Namespace: "default",
|
|
SubmissionMode: "InteractiveMode",
|
|
RayClusterSpecObject: RayClusterSpecObject{
|
|
RayVersion: util.RayVersion,
|
|
Image: util.RayImage,
|
|
HeadCPU: "1",
|
|
HeadGPU: "1",
|
|
HeadMemory: "5Gi",
|
|
WorkerReplicas: 3,
|
|
WorkerCPU: "2",
|
|
WorkerMemory: "10Gi",
|
|
WorkerGPU: "0",
|
|
},
|
|
}
|
|
|
|
result := testRayJobYamlObject.GenerateRayJobApplyConfig()
|
|
|
|
assert.Equal(t, testRayJobYamlObject.RayJobName, *result.Name)
|
|
assert.Equal(t, testRayJobYamlObject.Namespace, *result.Namespace)
|
|
assert.Equal(t, rayv1.JobSubmissionMode(testRayJobYamlObject.SubmissionMode), *result.Spec.SubmissionMode)
|
|
assert.Equal(t, testRayJobYamlObject.RayVersion, *result.Spec.RayClusterSpec.RayVersion)
|
|
assert.Equal(t, testRayJobYamlObject.Image, *result.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.Containers[0].Image)
|
|
assert.Equal(t, resource.MustParse(testRayJobYamlObject.HeadCPU), *result.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.Containers[0].Resources.Requests.Cpu())
|
|
assert.Equal(t, resource.MustParse(testRayJobYamlObject.HeadMemory), *result.Spec.RayClusterSpec.HeadGroupSpec.Template.Spec.Containers[0].Resources.Requests.Memory())
|
|
assert.Equal(t, "default-group", *result.Spec.RayClusterSpec.WorkerGroupSpecs[0].GroupName)
|
|
assert.Equal(t, testRayJobYamlObject.WorkerReplicas, *result.Spec.RayClusterSpec.WorkerGroupSpecs[0].Replicas)
|
|
assert.Equal(t, resource.MustParse(testRayJobYamlObject.WorkerCPU), *result.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.Containers[0].Resources.Requests.Cpu())
|
|
assert.Equal(t, resource.MustParse(testRayJobYamlObject.WorkerMemory), *result.Spec.RayClusterSpec.WorkerGroupSpecs[0].Template.Spec.Containers[0].Resources.Requests.Memory())
|
|
}
|
|
|
|
func TestConvertRayClusterApplyConfigToYaml(t *testing.T) {
|
|
testRayClusterYamlObject := RayClusterYamlObject{
|
|
ClusterName: "test-ray-cluster",
|
|
Namespace: "default",
|
|
RayClusterSpecObject: RayClusterSpecObject{
|
|
RayVersion: util.RayVersion,
|
|
Image: util.RayImage,
|
|
HeadCPU: "1",
|
|
HeadMemory: "5Gi",
|
|
HeadGPU: "1",
|
|
WorkerReplicas: 3,
|
|
WorkerCPU: "2",
|
|
WorkerMemory: "10Gi",
|
|
WorkerGPU: "0",
|
|
},
|
|
}
|
|
|
|
result := testRayClusterYamlObject.GenerateRayClusterApplyConfig()
|
|
|
|
resultString, err := ConvertRayClusterApplyConfigToYaml(result)
|
|
require.NoError(t, err)
|
|
expectedResultYaml := fmt.Sprintf(`apiVersion: ray.io/v1
|
|
kind: RayCluster
|
|
metadata:
|
|
name: test-ray-cluster
|
|
namespace: default
|
|
spec:
|
|
headGroupSpec:
|
|
rayStartParams:
|
|
dashboard-host: 0.0.0.0
|
|
template:
|
|
spec:
|
|
containers:
|
|
- image: %s
|
|
name: ray-head
|
|
ports:
|
|
- containerPort: 6379
|
|
name: gcs-server
|
|
- containerPort: 8265
|
|
name: dashboard
|
|
- containerPort: 10001
|
|
name: client
|
|
resources:
|
|
limits:
|
|
memory: 5Gi
|
|
nvidia.com/gpu: "1"
|
|
requests:
|
|
cpu: "1"
|
|
memory: 5Gi
|
|
nvidia.com/gpu: "1"
|
|
rayVersion: %s
|
|
workerGroupSpecs:
|
|
- groupName: default-group
|
|
rayStartParams:
|
|
metrics-export-port: "8080"
|
|
replicas: 3
|
|
template:
|
|
spec:
|
|
containers:
|
|
- image: %s
|
|
name: ray-worker
|
|
resources:
|
|
limits:
|
|
memory: 10Gi
|
|
requests:
|
|
cpu: "2"
|
|
memory: 10Gi`, util.RayImage, util.RayVersion, util.RayImage)
|
|
|
|
assert.Equal(t, strings.TrimSpace(expectedResultYaml), strings.TrimSpace(resultString))
|
|
}
|