Unverified Commit f962da3d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #63988 from dashpole/automated-cherry-pick-of-#63220-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #63220: fix formatting for memcg threshold Cherry pick of #63220 on release-1.10. #63220: fix formatting for memcg threshold
parents 9d6d1a13 efebd2b4
...@@ -19,6 +19,7 @@ package eviction ...@@ -19,6 +19,7 @@ package eviction
import ( import (
"fmt" "fmt"
"sort" "sort"
"strconv"
"sync" "sync"
"time" "time"
...@@ -207,7 +208,7 @@ func startMemoryThresholdNotifier(thresholds []evictionapi.Threshold, observatio ...@@ -207,7 +208,7 @@ func startMemoryThresholdNotifier(thresholds []evictionapi.Threshold, observatio
usageThreshold := resource.NewQuantity(observed.capacity.Value(), resource.DecimalSI) usageThreshold := resource.NewQuantity(observed.capacity.Value(), resource.DecimalSI)
usageThreshold.Sub(*quantity) usageThreshold.Sub(*quantity)
description := fmt.Sprintf("<%s available", formatThresholdValue(threshold.Value)) description := fmt.Sprintf("<%s available", formatThresholdValue(threshold.Value))
memcgThresholdNotifier, err := NewMemCGThresholdNotifier(cgpath, attribute, usageThreshold.String(), description, handler) memcgThresholdNotifier, err := NewMemCGThresholdNotifier(cgpath, attribute, strconv.FormatInt(usageThreshold.Value(), 10), description, handler)
if err != nil { if err != nil {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment