Skip to content

feat: spread container env to initContianers #294

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

Merged
merged 1 commit into from
Mar 10, 2025
Merged

feat: spread container env to initContianers #294

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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/open-policy-agent/cert-controller v0.12.0
github.com/stretchr/testify v1.9.0
k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver v0.32.2
k8s.io/apimachinery v0.32.2
Expand Down Expand Up @@ -49,6 +50,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
Expand Down
7 changes: 7 additions & 0 deletions pkg/controller_helper/modelsource/modelhub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ func (p *ModelHubProvider) InjectModelLoader(template *corev1.PodTemplateSpec, i
},
}

// We have exactly one container in the template.Spec.Containers.
spreadEnvToInitContainer(template.Spec.Containers[0].Env, initContainer)

// This is related to the model loader logics which will read the environment when loading models weights.
initContainer.Env = append(
initContainer.Env,
Expand Down Expand Up @@ -157,3 +160,7 @@ func (p *ModelHubProvider) InjectModelLoader(template *corev1.PodTemplateSpec, i
},
})
}

func spreadEnvToInitContainer(containerEnv []corev1.EnvVar, initContainer *corev1.Container) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a test to make sure only the envs we set in the Playground or BackendRuntime will be spread to the initContainers?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. PTAL.
/kind feature

initContainer.Env = append(initContainer.Env, containerEnv...)
}
60 changes: 60 additions & 0 deletions pkg/controller_helper/modelsource/modelsource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ package modelSource
import (
"testing"

"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"

coreapi "github.com/inftyai/llmaz/api/core/v1alpha1"
"github.com/inftyai/llmaz/test/util"
"github.com/inftyai/llmaz/test/util/wrapper"
Expand Down Expand Up @@ -69,3 +72,60 @@ func Test_ModelSourceProvider(t *testing.T) {
})
}
}

func TestEnvInjectModelLoader(t *testing.T) {
tests := []struct {
name string
provider ModelSourceProvider
template *corev1.PodTemplateSpec
}{
{
name: "Spread container env to initContiner using modelhub",
provider: &ModelHubProvider{
modelName: "test-model",
},
template: &corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "model-runner",
Image: "vllm:test",
Env: []corev1.EnvVar{
{Name: "http_proxy", Value: "1.1.1.1:1234"},
{Name: "https_proxy", Value: "1.1.1.1:1234"},
},
},
},
},
},
},
{
name: "Spread container env to initContiner using objstores",
provider: &URIProvider{
modelName: "test-model",
},
template: &corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "model-runner",
Image: "vllm:test",
Env: []corev1.EnvVar{
{Name: "http_proxy", Value: "1.1.1.1:1234"},
{Name: "https_proxy", Value: "1.1.1.1:1234"},
},
},
},
},
},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tt.provider.InjectModelLoader(tt.template, 0)
initContainer := tt.template.Spec.InitContainers[0]
assert.Subset(t, initContainer.Env, tt.template.Spec.Containers[0].Env)
})
}
}
3 changes: 3 additions & 0 deletions pkg/controller_helper/modelsource/uri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ func (p *URIProvider) InjectModelLoader(template *corev1.PodTemplateSpec, index
},
}

// We have exactly one container in the template.Spec.Containers.
spreadEnvToInitContainer(template.Spec.Containers[0].Env, initContainer)

switch p.protocol {
case OSS:
initContainer.Env = append(
Expand Down
Loading