mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #61252 from dixudx/fix_describe_toleration
Automatic merge from submit-queue (batch tested with PRs 60793, 61181, 61267, 61252, 61334). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix sorting tolerations in case the keys are equal **What this PR does / why we need it**: /kind bug /sig cli find a better way to sort `api.Toleration`, in case the key are the same **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #61250 **Special notes for your reviewer**: /cc @k82cn @kubernetes/sig-cli-api-reviews **Release note**: ```release-note fix sorting tolerations in case the keys are equal ```
This commit is contained in:
commit
787b8c0c6a
@ -3843,33 +3843,26 @@ func printTolerationsMultilineWithIndent(w PrefixWriter, initialIndent, title, i
|
||||
}
|
||||
|
||||
// to print tolerations in the sorted order
|
||||
keys := make([]string, 0, len(tolerations))
|
||||
for _, toleration := range tolerations {
|
||||
keys = append(keys, toleration.Key)
|
||||
}
|
||||
sort.Strings(keys)
|
||||
sort.Slice(tolerations, func(i, j int) bool {
|
||||
return tolerations[i].Key < tolerations[j].Key
|
||||
})
|
||||
|
||||
for i, key := range keys {
|
||||
for _, toleration := range tolerations {
|
||||
if toleration.Key == key {
|
||||
if i != 0 {
|
||||
w.Write(LEVEL_0, "%s", initialIndent)
|
||||
w.Write(LEVEL_0, "%s", innerIndent)
|
||||
}
|
||||
w.Write(LEVEL_0, "%s", toleration.Key)
|
||||
if len(toleration.Value) != 0 {
|
||||
w.Write(LEVEL_0, "=%s", toleration.Value)
|
||||
}
|
||||
if len(toleration.Effect) != 0 {
|
||||
w.Write(LEVEL_0, ":%s", toleration.Effect)
|
||||
}
|
||||
if toleration.TolerationSeconds != nil {
|
||||
w.Write(LEVEL_0, " for %ds", *toleration.TolerationSeconds)
|
||||
}
|
||||
w.Write(LEVEL_0, "\n")
|
||||
i++
|
||||
}
|
||||
for i, toleration := range tolerations {
|
||||
if i != 0 {
|
||||
w.Write(LEVEL_0, "%s", initialIndent)
|
||||
w.Write(LEVEL_0, "%s", innerIndent)
|
||||
}
|
||||
w.Write(LEVEL_0, "%s", toleration.Key)
|
||||
if len(toleration.Value) != 0 {
|
||||
w.Write(LEVEL_0, "=%s", toleration.Value)
|
||||
}
|
||||
if len(toleration.Effect) != 0 {
|
||||
w.Write(LEVEL_0, ":%s", toleration.Effect)
|
||||
}
|
||||
if toleration.TolerationSeconds != nil {
|
||||
w.Write(LEVEL_0, " for %ds", *toleration.TolerationSeconds)
|
||||
}
|
||||
w.Write(LEVEL_0, "\n")
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user