github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94629 from dims/sort-list-of-formats-for-logging-format-description

Browse Source 
Sort list of formats for --logging-format description to make it deterministic
This commit is contained in:
Kubernetes Prow Robot 2020-09-08 15:05:52 -07:00 committed by GitHub
commit 8ba20a8b43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/component-base/logs/registry.go
View File

@ -18,6 +18,7 @@ package logs
import ( import (
"fmt" "fmt"
"sort"
"github.com/go-logr/logr" "github.com/go-logr/logr"
json "k8s.io/component-base/logs/json" json "k8s.io/component-base/logs/json"
@ -84,12 +85,13 @@ func (lfr *LogFormatRegistry) Delete(name string) error {
return nil return nil
} }
// List names of registered log formats // List names of registered log formats (sorted)
func (lfr *LogFormatRegistry) List() []string { func (lfr *LogFormatRegistry) List() []string {
formats := make([]string, 0, len(lfr.registry)) formats := make([]string, 0, len(lfr.registry))
for f := range lfr.registry { for f := range lfr.registry {
formats = append(formats, f) formats = append(formats, f)
} }
sort.Strings(formats)
return formats return formats
} }