Skip to content
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

Fix custom gpu resource name specification #6129

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix custom gpu resource name specification #6129

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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ cmd/single/dist: export FLYTECONSOLE_VERSION ?= latest
cmd/single/dist:
script/get_flyteconsole_dist.sh

.PHONY: run
run: cmd/single/dist
POD_NAMESPACE=flyte go run -tags console cmd/main.go start --config ~/.flyte/flyte-single-binary-local.yaml

.PHONY: compile
compile: cmd/single/dist
go build -tags console -v -o flyte -ldflags=$(LD_FLAGS) ./cmd/
Expand Down
4 changes: 3 additions & 1 deletion flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
pluginmachinery_core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config"
)

func ToK8sEnvVar(env []*core.KeyValuePair) []v1.EnvVar {
Expand All @@ -20,6 +21,7 @@ func ToK8sEnvVar(env []*core.KeyValuePair) []v1.EnvVar {
// TODO we should modify the container resources to contain a map of enum values?
// Also we should probably create tolerations / taints, but we could do that as a post process
func ToK8sResourceList(resources []*core.Resources_ResourceEntry) (v1.ResourceList, error) {
gpuResourceName := config.GetK8sPluginConfig().GpuResourceName
k8sResources := make(v1.ResourceList, len(resources))
for _, r := range resources {
rVal := r.GetValue()
Expand All @@ -38,7 +40,7 @@ func ToK8sResourceList(resources []*core.Resources_ResourceEntry) (v1.ResourceLi
}
case core.Resources_GPU:
if !v.IsZero() {
k8sResources[ResourceNvidiaGPU] = v
k8sResources[gpuResourceName] = v
}
case core.Resources_EPHEMERAL_STORAGE:
if !v.IsZero() {
Expand Down
13 changes: 13 additions & 0 deletions flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks"
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config"
)

func TestToK8sEnvVar(t *testing.T) {
Expand Down Expand Up @@ -44,6 +45,18 @@ func TestToK8sResourceList(t *testing.T) {
assert.Equal(t, resource.MustParse("1024Mi"), r[v1.ResourceMemory])
assert.Equal(t, resource.MustParse("1024Mi"), r[v1.ResourceEphemeralStorage])
}
{
gpuResourceName := v1.ResourceName("amd.com/gpu")
cfg := config.GetK8sPluginConfig()
cfg.GpuResourceName = gpuResourceName
assert.NoError(t, config.SetK8sPluginConfig(cfg))
r, err := ToK8sResourceList([]*core.Resources_ResourceEntry{
{Name: core.Resources_GPU, Value: "1"},
})
assert.NoError(t, err)
assert.NotEmpty(t, r)
assert.Equal(t, resource.MustParse("1"), r[gpuResourceName])
}
{
r, err := ToK8sResourceList([]*core.Resources_ResourceEntry{})
assert.NoError(t, err)
Expand Down
Loading