Skip to content

Commit e4ce0d5

Browse files
zhixian82zhouyan
authored andcommitted
add resources to earlystopping container
1 parent 0d0e77f commit e4ce0d5

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

pkg/controller.v1beta1/suggestion/composer/composer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ func (g *General) desiredContainers(s *suggestionsv1beta1.Suggestion,
248248
ContainerPort: consts.DefaultEarlyStoppingPort,
249249
},
250250
},
251+
Resources: earlyStoppingConfigData.Resource,
251252
}
252253

253254
containers = append(containers, earlyStoppingContainer)

pkg/controller.v1beta1/suggestion/composer/composer_test.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,25 @@ func newFakeSuggestionConfig() katibconfig.SuggestionConfig {
665665
}
666666

667667
func newFakeEarlyStoppingConfig() katibconfig.EarlyStoppingConfig {
668+
cpuQ, _ := resource.ParseQuantity(cpu)
669+
memoryQ, _ := resource.ParseQuantity(memory)
670+
diskQ, _ := resource.ParseQuantity(disk)
671+
668672
return katibconfig.EarlyStoppingConfig{
669673
Image: image,
670674
ImagePullPolicy: imagePullPolicy,
675+
Resource: corev1.ResourceRequirements{
676+
Limits: corev1.ResourceList{
677+
corev1.ResourceCPU: cpuQ,
678+
corev1.ResourceMemory: memoryQ,
679+
corev1.ResourceEphemeralStorage: diskQ,
680+
},
681+
Requests: corev1.ResourceList{
682+
corev1.ResourceCPU: cpuQ,
683+
corev1.ResourceMemory: memoryQ,
684+
corev1.ResourceEphemeralStorage: diskQ,
685+
},
686+
},
671687
}
672688
}
673689

@@ -836,6 +852,18 @@ func newFakeContainers() []corev1.Container {
836852
ContainerPort: consts.DefaultEarlyStoppingPort,
837853
},
838854
},
855+
Resources: corev1.ResourceRequirements{
856+
Limits: corev1.ResourceList{
857+
corev1.ResourceCPU: cpuQ,
858+
corev1.ResourceMemory: memoryQ,
859+
corev1.ResourceEphemeralStorage: diskQ,
860+
},
861+
Requests: corev1.ResourceList{
862+
corev1.ResourceCPU: cpuQ,
863+
corev1.ResourceMemory: memoryQ,
864+
corev1.ResourceEphemeralStorage: diskQ,
865+
},
866+
},
839867
},
840868
}
841869
}

pkg/util/v1beta1/katibconfig/config.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ type SuggestionConfig struct {
4646

4747
// EarlyStoppingConfig is the JSON early stopping structure in Katib config.
4848
type EarlyStoppingConfig struct {
49-
Image string `json:"image"`
50-
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
49+
Image string `json:"image"`
50+
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
51+
Resource corev1.ResourceRequirements `json:"resources,omitempty"`
5152
}
5253

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

181+
// Set resource requirements
182+
earlyStoppingConfigData.Resource = setResourceRequirements(earlyStoppingConfigData.Resource)
183+
180184
return earlyStoppingConfigData, nil
181185
}
182186

pkg/util/v1beta1/katibconfig/config_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ func newFakeEarlyStoppingConfig() *EarlyStoppingConfig {
426426
return &EarlyStoppingConfig{
427427
Image: "early-stopping-image",
428428
ImagePullPolicy: consts.DefaultImagePullPolicy,
429+
Resource: *setFakeResourceRequirements(),
429430
}
430431
}
431432

0 commit comments

Comments
 (0)