Skip to content

feat: add global default_image_builder_container_resources configuration #28

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
yetone merged 1 commit into from
Aug 4, 2023
Merged

feat: add global default_image_builder_container_resources configuration #28

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
16 changes: 16 additions & 0 deletions controllers/resources/bentorequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,6 +1441,7 @@ echo "Done"
var globalExtraPodMetadata *resourcesv1alpha1.ExtraPodMetadata
var globalExtraPodSpec *resourcesv1alpha1.ExtraPodSpec
var globalExtraContainerEnv []corev1.EnvVar
var globalDefaultImageBuilderContainerResources *corev1.ResourceRequirements
var buildArgs []string
var builderArgs []string

Expand All @@ -1462,6 +1463,7 @@ echo "Done"

if !configCmIsNotFound {
r.Recorder.Eventf(opt.BentoRequest, corev1.EventTypeNormal, "GenerateImageBuilderPod", "Configmap %s is got from namespace %s", configCmName, configNamespace)

globalExtraPodMetadata = &resourcesv1alpha1.ExtraPodMetadata{}

if val, ok := configCm.Data["extra_pod_metadata"]; ok {
Expand Down Expand Up @@ -1492,6 +1494,16 @@ echo "Done"
}
}

globalDefaultImageBuilderContainerResources = &corev1.ResourceRequirements{}

if val, ok := configCm.Data["default_image_builder_container_resources"]; ok {
err = yaml.Unmarshal([]byte(val), globalDefaultImageBuilderContainerResources)
if err != nil {
err = errors.Wrapf(err, "failed to yaml unmarshal default_image_builder_container_resources, please check the configmap %s in namespace %s", configCmName, configNamespace)
return
}
}

buildArgs = []string{}

if val, ok := configCm.Data["build_args"]; ok {
Expand Down Expand Up @@ -1718,6 +1730,10 @@ echo "Done"
},
}

if globalDefaultImageBuilderContainerResources != nil {
container.Resources = *globalDefaultImageBuilderContainerResources
}

if opt.BentoRequest.Spec.ImageBuilderContainerResources != nil {
container.Resources = *opt.BentoRequest.Spec.ImageBuilderContainerResources
}
Expand Down