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.

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

add resources to earlystopping container #2038

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pkg/controller.v1beta1/suggestion/composer/composer.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ func (g *General) desiredContainers(s *suggestionsv1beta1.Suggestion,
ContainerPort: consts.DefaultEarlyStoppingPort,
},
},
Resources: earlyStoppingConfigData.Resource,
}

containers = append(containers, earlyStoppingContainer)
Expand Down
28 changes: 28 additions & 0 deletions pkg/controller.v1beta1/suggestion/composer/composer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -665,9 +665,25 @@ func newFakeSuggestionConfig() katibconfig.SuggestionConfig {
}

func newFakeEarlyStoppingConfig() katibconfig.EarlyStoppingConfig {
cpuQ, _ := resource.ParseQuantity(cpu)
memoryQ, _ := resource.ParseQuantity(memory)
diskQ, _ := resource.ParseQuantity(disk)

return katibconfig.EarlyStoppingConfig{
Image: image,
ImagePullPolicy: imagePullPolicy,
Resource: corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: cpuQ,
corev1.ResourceMemory: memoryQ,
corev1.ResourceEphemeralStorage: diskQ,
},
Requests: corev1.ResourceList{
corev1.ResourceCPU: cpuQ,
corev1.ResourceMemory: memoryQ,
corev1.ResourceEphemeralStorage: diskQ,
},
},
}
}

Expand Down Expand Up @@ -836,6 +852,18 @@ func newFakeContainers() []corev1.Container {
ContainerPort: consts.DefaultEarlyStoppingPort,
},
},
Resources: corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: cpuQ,
corev1.ResourceMemory: memoryQ,
corev1.ResourceEphemeralStorage: diskQ,
},
Requests: corev1.ResourceList{
corev1.ResourceCPU: cpuQ,
corev1.ResourceMemory: memoryQ,
corev1.ResourceEphemeralStorage: diskQ,
},
},
},
}
}
Expand Down
8 changes: 6 additions & 2 deletions pkg/util/v1beta1/katibconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ type SuggestionConfig struct {

// EarlyStoppingConfig is the JSON early stopping structure in Katib config.
type EarlyStoppingConfig struct {
Image string `json:"image"`
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
Image string `json:"image"`
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
Resource corev1.ResourceRequirements `json:"resources,omitempty"`
}

// MetricsCollectorConfig is the JSON metrics collector structure in Katib config.
Expand Down Expand Up @@ -177,6 +178,9 @@ func GetEarlyStoppingConfigData(algorithmName string, client client.Client) (Ear
// Set Image Pull Policy.
earlyStoppingConfigData.ImagePullPolicy = setImagePullPolicy(earlyStoppingConfigData.ImagePullPolicy)

// Set resource requirements
earlyStoppingConfigData.Resource = setResourceRequirements(earlyStoppingConfigData.Resource)

return earlyStoppingConfigData, nil
}

Expand Down
1 change: 1 addition & 0 deletions pkg/util/v1beta1/katibconfig/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ func newFakeEarlyStoppingConfig() *EarlyStoppingConfig {
return &EarlyStoppingConfig{
Image: "early-stopping-image",
ImagePullPolicy: consts.DefaultImagePullPolicy,
Resource: *setFakeResourceRequirements(),
}
}

Expand Down