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

Jump to bottom

Add envs in cluster service api #432

Merged
merged 12 commits into from
Aug 4, 2022
Merged

Add envs in cluster service api #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c2211a3
debug
MissiontoMars Aug 1, 2022
4c99c4c
debug complete
MissiontoMars Aug 2, 2022
5e0d29a
remove useless code
MissiontoMars Aug 2, 2022
8af83dc
add unit test
MissiontoMars Aug 2, 2022
6964477
fix lint
MissiontoMars Aug 2, 2022
a8ce30e
fix tests
MissiontoMars Aug 2, 2022
a9077bf
fix tests
MissiontoMars Aug 2, 2022
bba66c9
fix tests
MissiontoMars Aug 2, 2022
83974a1
do not modify crd
MissiontoMars Aug 3, 2022
1b0b477
fix lint
MissiontoMars Aug 3, 2022
37a9368
revert useless
MissiontoMars Aug 3, 2022
833cb00
fix duplicated envs
MissiontoMars Aug 3, 2022
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
10 changes: 10 additions & 0 deletions apiserver/pkg/util/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ func buildHeadPodTemplate(cluster *api.Cluster, spec *api.HeadGroupSpec, compute
podTemplateSpec.Spec.Containers[0].Resources.Limits[v1.ResourceName(accelerator)] = resource.MustParse(fmt.Sprint(gpu))
}

for k, v := range cluster.Envs {
podTemplateSpec.Spec.Containers[0].Env = append(podTemplateSpec.Spec.Containers[0].Env, v1.EnvVar{
Name: k, Value: v,
})
}
return podTemplateSpec
}

Expand Down Expand Up @@ -323,6 +328,11 @@ func buildWorkerPodTemplate(cluster *api.Cluster, spec *api.WorkerGroupSpec, com
podTemplateSpec.Spec.Containers[0].Resources.Limits[v1.ResourceName(accelerator)] = resource.MustParse(fmt.Sprint(gpu))
}

for k, v := range cluster.Envs {
podTemplateSpec.Spec.Containers[0].Env = append(podTemplateSpec.Spec.Containers[0].Env, v1.EnvVar{
Name: k, Value: v,
})
}
return podTemplateSpec
}

Expand Down
3 changes: 3 additions & 0 deletions proto/cluster.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ message Cluster {

// Output. The service endpoint of the cluster
map<string, string> service_endpoint = 11;

// Optional input field. Container environment variables from user.
map<string, string> envs = 12;
}

message ClusterSpec {
Expand Down
Loading