diff --git a/go.mod b/go.mod index 4d49981ef..2b81707cc 100644 --- a/go.mod +++ b/go.mod @@ -31,15 +31,15 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20220209214540-3681064d5158 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20220317021646-b9830ac37b46 + k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7 k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b - k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4 + k8s.io/client-go v0.0.0-20220319171433-c47b8028952e k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 - k8s.io/metrics v0.0.0-20220319183727-657a3501c994 + k8s.io/metrics v0.0.0-20220319183730-ef2da6b32ee7 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 sigs.k8s.io/kustomize/kustomize/v4 v4.4.1 @@ -48,12 +48,12 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220317021646-b9830ac37b46 + k8s.io/api => k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b - k8s.io/client-go => k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220317020552-cdbee2b416a6 + k8s.io/client-go => k8s.io/client-go v0.0.0-20220319171433-c47b8028952e + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220318020739-3e006776d5ff k8s.io/component-base => k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e - k8s.io/metrics => k8s.io/metrics v0.0.0-20220319183727-657a3501c994 + k8s.io/metrics => k8s.io/metrics v0.0.0-20220319183730-ef2da6b32ee7 ) diff --git a/go.sum b/go.sum index 42adef11e..8dfd28614 100644 --- a/go.sum +++ b/go.sum @@ -848,15 +848,15 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20220317021646-b9830ac37b46 h1:GiOCYRoSGe/xX3X60/Z+3Xq6C9/dyKcRElTN01Hpg3o= -k8s.io/api v0.0.0-20220317021646-b9830ac37b46/go.mod h1:RvsmB1DuKSEVw+3ZZ6fseROF1PYQkewMo0uNNvIcXKs= +k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7 h1:mZ+ypm/uYY8RMzg27GxqdV7qZMIc8MhucmkPshG4RGs= +k8s.io/api v0.0.0-20220319170349-0f1a9d7727b7/go.mod h1:RvsmB1DuKSEVw+3ZZ6fseROF1PYQkewMo0uNNvIcXKs= k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d h1:X97IrPL+mdzFxeVmVkbtko19rowdqorN20036BKf+qQ= k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d/go.mod h1:Xig8YiaWvp151KCOs9q3j/mLnW/ooZAR6EtxqHwhtD0= k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b h1:W+IfaoVJ7qTkfWbW8wQ/XBtYM0ArVa2/goZxF2mq38s= k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b/go.mod h1:wed/MDb+CPaezj4DJvafsK6lPdJc6lA2yv7ncI9ehXA= -k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4 h1:WJ6/FLxLxxn9ZZ5EvgfXxRp7gmM3BazP9nDgRckP0/A= -k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4/go.mod h1:R1qGhn0GbR+sGAtVNigCRU8sJw8z6qMZrPFK8CZ4Cs0= -k8s.io/code-generator v0.0.0-20220317020552-cdbee2b416a6/go.mod h1:f6E+BgTk8onkBfwvIkiR0bo407Qt+HzXQThjtFQtW5M= +k8s.io/client-go v0.0.0-20220319171433-c47b8028952e h1:HITmGOs3k34eu/iiZWopDr4UPx7PVcqwf5J83RovqgQ= +k8s.io/client-go v0.0.0-20220319171433-c47b8028952e/go.mod h1:jtN3PxR5PkSth3KEUE6KOc3My8JCjLNpmn9jze8Jo/M= +k8s.io/code-generator v0.0.0-20220318020739-3e006776d5ff/go.mod h1:f6E+BgTk8onkBfwvIkiR0bo407Qt+HzXQThjtFQtW5M= k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e h1:n/o6H3aUL5zCceACfq4tu5ogq86BLfrTPc/ZZr4KzbY= k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e/go.mod h1:NLi1Z0XVyd14kA5naS5PvPwSONj7gRtkwuF2oMI7t0s= k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e h1:8zahGgD+EvdEFDKgcjm6Hc9O6YnbgPUKIwVgxxrpnog= @@ -871,8 +871,8 @@ k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 h1:M0Korml79JW27ndc6lxLxkNP8QVqdpBj0MIEZliKy8A= k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18/go.mod h1:p8bjuqy9+BWvBDEBjdeVYtX6kMWWg6OhY1V1jhC9MPI= -k8s.io/metrics v0.0.0-20220319183727-657a3501c994 h1:e45UzW9RzWLbqprt2/yMuv2id60IQUrK0oc0AoVl+Ro= -k8s.io/metrics v0.0.0-20220319183727-657a3501c994/go.mod h1:7aFJWnDKVwAU71E9NHyPF577Po+UNrvJxGjmx0oJLXQ= +k8s.io/metrics v0.0.0-20220319183730-ef2da6b32ee7 h1:6v8CUruTrnAKP1B1UNU0j6at4nfaq2NwoYECBT58uMs= +k8s.io/metrics v0.0.0-20220319183730-ef2da6b32ee7/go.mod h1:deWmHw1wJq+PJ7qHEvvG/x1H0oIO40hUTC59u1yZ7/s= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/pkg/cmd/get/customcolumn_flags.go b/pkg/cmd/get/customcolumn_flags.go index eee919b49..efd7fcf75 100644 --- a/pkg/cmd/get/customcolumn_flags.go +++ b/pkg/cmd/get/customcolumn_flags.go @@ -19,6 +19,7 @@ package get import ( "fmt" "os" + "sort" "strings" "github.com/spf13/cobra" @@ -45,6 +46,7 @@ func (f *CustomColumnsPrintFlags) AllowedFormats() []string { for format := range columnsFormats { formats = append(formats, format) } + sort.Strings(formats) return formats }