Skip to content

Commit cb764ad

Browse files
committed
Fix custom gpu resource name specification
1 parent 61838b4 commit cb764ad

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ cmd/single/dist: export FLYTECONSOLE_VERSION ?= latest
1818
cmd/single/dist:
1919
script/get_flyteconsole_dist.sh
2020

21+
.PHONY: run
22+
run: cmd/single/dist
23+
POD_NAMESPACE=flyte go run -tags console cmd/main.go start --config ~/.flyte/flyte-single-binary-local.yaml
24+
2125
.PHONY: compile
2226
compile: cmd/single/dist
2327
go build -tags console -v -o flyte -ldflags=$(LD_FLAGS) ./cmd/

flyteplugins/go/tasks/pluginmachinery/flytek8s/utils.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
99
pluginmachinery_core "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
10+
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config"
1011
)
1112

1213
func ToK8sEnvVar(env []*core.KeyValuePair) []v1.EnvVar {
@@ -20,6 +21,7 @@ func ToK8sEnvVar(env []*core.KeyValuePair) []v1.EnvVar {
2021
// TODO we should modify the container resources to contain a map of enum values?
2122
// Also we should probably create tolerations / taints, but we could do that as a post process
2223
func ToK8sResourceList(resources []*core.Resources_ResourceEntry) (v1.ResourceList, error) {
24+
gpuResourceName := config.GetK8sPluginConfig().GpuResourceName
2325
k8sResources := make(v1.ResourceList, len(resources))
2426
for _, r := range resources {
2527
rVal := r.GetValue()
@@ -38,7 +40,7 @@ func ToK8sResourceList(resources []*core.Resources_ResourceEntry) (v1.ResourceLi
3840
}
3941
case core.Resources_GPU:
4042
if !v.IsZero() {
41-
k8sResources[ResourceNvidiaGPU] = v
43+
k8sResources[gpuResourceName] = v
4244
}
4345
case core.Resources_EPHEMERAL_STORAGE:
4446
if !v.IsZero() {

flyteplugins/go/tasks/pluginmachinery/flytek8s/utils_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
1111
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks"
12+
"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/flytek8s/config"
1213
)
1314

1415
func TestToK8sEnvVar(t *testing.T) {
@@ -44,6 +45,18 @@ func TestToK8sResourceList(t *testing.T) {
4445
assert.Equal(t, resource.MustParse("1024Mi"), r[v1.ResourceMemory])
4546
assert.Equal(t, resource.MustParse("1024Mi"), r[v1.ResourceEphemeralStorage])
4647
}
48+
{
49+
gpuResourceName := v1.ResourceName("amd.com/gpu")
50+
cfg := config.GetK8sPluginConfig()
51+
cfg.GpuResourceName = gpuResourceName
52+
assert.NoError(t, config.SetK8sPluginConfig(cfg))
53+
r, err := ToK8sResourceList([]*core.Resources_ResourceEntry{
54+
{Name: core.Resources_GPU, Value: "1"},
55+
})
56+
assert.NoError(t, err)
57+
assert.NotEmpty(t, r)
58+
assert.Equal(t, resource.MustParse("1"), r[gpuResourceName])
59+
}
4760
{
4861
r, err := ToK8sResourceList([]*core.Resources_ResourceEntry{})
4962
assert.NoError(t, err)

0 commit comments

Comments
 (0)