Skip to content

Commit

Permalink
Merge pull request #5036 from grosser/grosser/join
Browse files Browse the repository at this point in the history
use strings.Join to build list of names
  • Loading branch information
k8s-ci-robot authored Aug 10, 2022
2 parents 1d9fe7c + a09f4d9 commit 07ea116
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
11 changes: 4 additions & 7 deletions cluster-autoscaler/cloudprovider/resource_limiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ limitations under the License.
package cloudprovider

import (
"bytes"
"fmt"
"k8s.io/apimachinery/pkg/util/sets"
"math"
"strings"
)

// ResourceLimiter contains limits (max, min) for resources (cores, memory etc.).
Expand Down Expand Up @@ -82,12 +82,9 @@ func (r *ResourceLimiter) HasMaxLimitSet(resourceName string) bool {
}

func (r *ResourceLimiter) String() string {
var buffer bytes.Buffer
var resourceDetails = []string{}
for _, name := range r.GetResources() {
if buffer.Len() > 0 {
buffer.WriteString(", ")
}
buffer.WriteString(fmt.Sprintf("{%s : %d - %d}", name, r.GetMin(name), r.GetMax(name)))
resourceDetails = append(resourceDetails, fmt.Sprintf("{%s : %d - %d}", name, r.GetMin(name), r.GetMax(name)))
}
return buffer.String()
return strings.Join(resourceDetails, ", ")
}
12 changes: 4 additions & 8 deletions cluster-autoscaler/core/scale_up.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package core

import (
"bytes"
"fmt"
"math"
"strings"
Expand Down Expand Up @@ -585,14 +584,11 @@ func ScaleUp(context *context.AutoscalingContext, processors *ca_processors.Auto
}
}
if len(targetNodeGroups) > 1 {
var buffer bytes.Buffer
for i, ng := range targetNodeGroups {
if i > 0 {
buffer.WriteString(", ")
}
buffer.WriteString(ng.Id())
var names = []string{}
for _, ng := range targetNodeGroups {
names = append(names, ng.Id())
}
klog.V(1).Infof("Splitting scale-up between %v similar node groups: {%v}", len(targetNodeGroups), buffer.String())
klog.V(1).Infof("Splitting scale-up between %v similar node groups: {%v}", len(targetNodeGroups), strings.Join(names, ", "))
}
}
scaleUpInfos, typedErr := processors.NodeGroupSetProcessor.BalanceScaleUpBetweenGroups(
Expand Down

0 comments on commit 07ea116

Please sign in to comment.