Skip to content

Commit

Permalink
Merge pull request #7802 from voelzmo/nm/vpa-format-string
Browse files Browse the repository at this point in the history
Refactor to format VPA Updater log more efficiently
  • Loading branch information
k8s-ci-robot authored Feb 4, 2025
2 parents b1265b2 + 1899678 commit dffe7ac
Showing 1 changed file with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package priority

import (
"flag"
"fmt"
"sort"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -170,23 +170,28 @@ func (calc *UpdatePriorityCalculator) GetSortedPods(admission PodEvictionAdmissi
func (calc *UpdatePriorityCalculator) GetProcessedRecommendationTargets(r *vpa_types.RecommendedPodResources) string {
sb := &strings.Builder{}
for _, cr := range r.ContainerRecommendations {
sb.WriteString(fmt.Sprintf("%s: ", cr.ContainerName))
sb.WriteString(cr.ContainerName)
sb.WriteString(": ")
if cr.Target != nil {
sb.WriteString("target: ")
if !cr.Target.Memory().IsZero() {
sb.WriteString(fmt.Sprintf("%dk ", cr.Target.Memory().ScaledValue(resource.Kilo)))
sb.WriteString(strconv.FormatInt(cr.Target.Memory().ScaledValue(resource.Kilo), 10))
sb.WriteString("k ")
}
if !cr.Target.Cpu().IsZero() {
sb.WriteString(fmt.Sprintf("%vm; ", cr.Target.Cpu().MilliValue()))
sb.WriteString(strconv.FormatInt(cr.Target.Cpu().MilliValue(), 10))
sb.WriteString("m; ")
}
}
if cr.UncappedTarget != nil {
sb.WriteString("uncappedTarget: ")
if !cr.UncappedTarget.Memory().IsZero() {
sb.WriteString(fmt.Sprintf("%dk ", cr.UncappedTarget.Memory().ScaledValue(resource.Kilo)))
sb.WriteString(strconv.FormatInt(cr.Target.Memory().ScaledValue(resource.Kilo), 10))
sb.WriteString("k ")
}
if !cr.UncappedTarget.Cpu().IsZero() {
sb.WriteString(fmt.Sprintf("%vm;", cr.UncappedTarget.Cpu().MilliValue()))
sb.WriteString(strconv.FormatInt(cr.Target.Cpu().MilliValue(), 10))
sb.WriteString("m;")
}
}
}
Expand Down

0 comments on commit dffe7ac

Please sign in to comment.