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 disk setting into suggestionConfiguration #989

Merged
merged 3 commits into from
Dec 30, 2019
Merged

add disk setting into suggestionConfiguration #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce5f412
add configuration of disk(EphemeralStorage) for suggestion controller
sperlingxx Dec 30, 2019
694ed44
fix comments
sperlingxx Dec 30, 2019
a8d9734
bug fix
sperlingxx Dec 30, 2019
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
8 changes: 8 additions & 0 deletions pkg/controller.v1alpha3/consts/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ const (
LabelSuggestionMemRequestTag = "memRequest"
// DefaultMemRequest is the default value for mem Request
DefaultMemRequest = "10Mi"
// LabelSuggestionDiskLimitTag is the name of suggestion Disk Limit config in configmap.
LabelSuggestionDiskLimitTag = "diskLimit"
// DefaultMemLimit is the default value for mem Limit
DefaultDiskLimit = "5Gi"
// LabelSuggestionDiskRequestTag is the name of suggestion Disk Request config in configmap.
LabelSuggestionDiskRequestTag = "diskRequest"
// DefaultMemRequest is the default value for mem Request
DefaultDiskRequest = "500Mi"
// LabelMetricsCollectorSidecar is the name of metrics collector config in configmap.
LabelMetricsCollectorSidecar = "metrics-collector-sidecar"
// LabelMetricsCollectorSidecarImage is the name of metrics collector image config in configmap.
Expand Down
20 changes: 16 additions & 4 deletions pkg/controller.v1alpha3/suggestion/composer/composer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ func (g *General) desiredContainer(s *suggestionsv1alpha3.Suggestion) (*corev1.C
suggestionCPURequest := suggestionConfigData[consts.LabelSuggestionCPURequestTag]
suggestionMemLimit := suggestionConfigData[consts.LabelSuggestionMemLimitTag]
suggestionMemRequest := suggestionConfigData[consts.LabelSuggestionMemRequestTag]
suggestionDiskLimit := suggestionConfigData[consts.LabelSuggestionDiskLimitTag]
suggestionDiskRequest := suggestionConfigData[consts.LabelSuggestionDiskRequestTag]
c := &corev1.Container{
Name: consts.ContainerSuggestion,
}
Expand Down Expand Up @@ -147,15 +149,25 @@ func (g *General) desiredContainer(s *suggestionsv1alpha3.Suggestion) (*corev1.C
if err != nil {
return nil, err
}
diskLimitQuantity, err := resource.ParseQuantity(suggestionDiskLimit)
if err != nil {
return nil, err
}
diskRequestQuantity, err := resource.ParseQuantity(suggestionDiskRequest)
if err != nil {
return nil, err
}

c.Resources = corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: cpuLimitQuantity,
corev1.ResourceMemory: memLimitQuantity,
corev1.ResourceCPU: cpuLimitQuantity,
corev1.ResourceMemory: memLimitQuantity,
corev1.ResourceEphemeralStorage: diskLimitQuantity,
},
Requests: corev1.ResourceList{
corev1.ResourceCPU: cpuRequestQuantity,
corev1.ResourceMemory: memRequestQuantity,
corev1.ResourceCPU: cpuRequestQuantity,
corev1.ResourceMemory: memRequestQuantity,
corev1.ResourceEphemeralStorage: diskRequestQuantity,
},
}

Expand Down
16 changes: 13 additions & 3 deletions pkg/util/v1alpha3/katibconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +42,41 @@ func GetSuggestionConfigData(algorithmName string, client client.Client) (map[st
return map[string]string{}, errors.New("Required value for " + consts.LabelSuggestionImageTag + " configuration of algorithm name " + algorithmName)
}

// Set default values for CPU and Memory
// Set default values for CPU, Memory and Disk
suggestionConfigData[consts.LabelSuggestionCPURequestTag] = consts.DefaultCPURequest
suggestionConfigData[consts.LabelSuggestionMemRequestTag] = consts.DefaultMemRequest
suggestionConfigData[consts.LabelSuggestionDiskRequestTag] = consts.DefaultDiskRequest
suggestionConfigData[consts.LabelSuggestionCPULimitTag] = consts.DefaultCPULimit
suggestionConfigData[consts.LabelSuggestionMemLimitTag] = consts.DefaultMemLimit
suggestionConfigData[consts.LabelSuggestionDiskLimitTag] = consts.DefaultDiskLimit

// Get CPU and Memory Requests from config
// Get CPU, Memory and Disk Requests from config
cpuRequest := suggestionConfig.Resource.Requests[corev1.ResourceCPU]
memRequest := suggestionConfig.Resource.Requests[corev1.ResourceMemory]
diskRequest := suggestionConfig.Resource.Requests[corev1.ResourceEphemeralStorage]
if !cpuRequest.IsZero() {
suggestionConfigData[consts.LabelSuggestionCPURequestTag] = cpuRequest.String()
}
if !memRequest.IsZero() {
suggestionConfigData[consts.LabelSuggestionMemRequestTag] = memRequest.String()
}
if !diskRequest.IsZero() {
suggestionConfigData[consts.LabelSuggestionDiskRequestTag] = diskRequest.String()
}

// Get CPU and Memory Limits from config
// Get CPU, Memory and Disk Limits from config
cpuLimit := suggestionConfig.Resource.Limits[corev1.ResourceCPU]
memLimit := suggestionConfig.Resource.Limits[corev1.ResourceMemory]
diskLimit := suggestionConfig.Resource.Limits[corev1.ResourceEphemeralStorage]
if !cpuLimit.IsZero() {
suggestionConfigData[consts.LabelSuggestionCPULimitTag] = cpuLimit.String()
}
if !memLimit.IsZero() {
suggestionConfigData[consts.LabelSuggestionMemLimitTag] = memLimit.String()
}
if !diskLimit.IsZero() {
suggestionConfigData[consts.LabelSuggestionDiskLimitTag] = diskLimit.String()
}

} else {
return map[string]string{}, errors.New("Failed to find algorithm " + algorithmName + " config in configmap " + consts.KatibConfigMapName)
Expand Down