diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 370cebcf4..450e2970f 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -226,6 +226,10 @@ "ImportPath": "github.com/fsnotify/fsnotify", "Rev": "v1.4.9" }, + { + "ImportPath": "github.com/fvbommel/sortorder", + "Rev": "v1.0.1" + }, { "ImportPath": "github.com/ghodss/yaml", "Rev": "v1.0.0" @@ -606,10 +610,6 @@ "ImportPath": "github.com/xiang90/probing", "Rev": "43a291ad63a2" }, - { - "ImportPath": "github.com/xlab/handysort", - "Rev": "fb3537ed64a1" - }, { "ImportPath": "github.com/xordataexchange/crypt", "Rev": "b2862e3d0a77" @@ -772,7 +772,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "ba26c4506d39" + "Rev": "7cd71358d5b6" }, { "ImportPath": "k8s.io/code-generator", @@ -817,10 +817,6 @@ { "ImportPath": "sigs.k8s.io/yaml", "Rev": "v1.2.0" - }, - { - "ImportPath": "vbom.ml/util", - "Rev": "db5cfe13f5cc" } ] } \ No newline at end of file diff --git a/go.mod b/go.mod index b043ea209..7ea3ec6a8 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/evanphx/json-patch v4.9.0+incompatible github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/fatih/camelcase v1.0.0 + github.com/fvbommel/sortorder v1.0.1 github.com/go-openapi/spec v0.19.3 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect @@ -31,13 +32,12 @@ require ( github.com/spf13/cobra v1.0.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.4.0 - github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 gopkg.in/yaml.v2 v2.2.8 k8s.io/api v0.0.0-20200902131916-03aa42fe49ac k8s.io/apimachinery v0.0.0-20200902171538-6084ad015ddd k8s.io/cli-runtime v0.0.0-20200902135640-4d285f01f90f - k8s.io/client-go v0.0.0-20200903011833-ba26c4506d39 + k8s.io/client-go v0.0.0-20200903171857-7cd71358d5b6 k8s.io/component-base v0.0.0-20200902133139-1d2c8187d823 k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 @@ -45,14 +45,13 @@ require ( k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 - vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc ) replace ( k8s.io/api => k8s.io/api v0.0.0-20200902131916-03aa42fe49ac k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200902171538-6084ad015ddd k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200902135640-4d285f01f90f - k8s.io/client-go => k8s.io/client-go v0.0.0-20200903011833-ba26c4506d39 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200903171857-7cd71358d5b6 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200902211251-7dbebec02af3 k8s.io/component-base => k8s.io/component-base v0.0.0-20200902133139-1d2c8187d823 k8s.io/metrics => k8s.io/metrics v0.0.0-20200902135418-05baf84b7531 diff --git a/go.sum b/go.sum index 4c3c6d6b1..5cae7829e 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,8 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE= +github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -302,8 +304,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -506,7 +506,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt k8s.io/api v0.0.0-20200902131916-03aa42fe49ac/go.mod h1:RRBubtUUfQknZlqyrIcyOzchPl/ndgo1xAGCzjrKrQU= k8s.io/apimachinery v0.0.0-20200902171538-6084ad015ddd/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/cli-runtime v0.0.0-20200902135640-4d285f01f90f/go.mod h1:dMX648DBrr+l8yWksbYdwcMzDEM/H0QGyJ8EOKiF9xY= -k8s.io/client-go v0.0.0-20200903011833-ba26c4506d39/go.mod h1:IlEd8lxjDG8cvAB6MHAPJe9pO2IOxBafW1hrpyMFf0U= +k8s.io/client-go v0.0.0-20200903171857-7cd71358d5b6/go.mod h1:IlEd8lxjDG8cvAB6MHAPJe9pO2IOxBafW1hrpyMFf0U= k8s.io/code-generator v0.0.0-20200902211251-7dbebec02af3/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= k8s.io/component-base v0.0.0-20200902133139-1d2c8187d823/go.mod h1:0gnPCcp/GY+eCzs3ctBHW+6CDRXi6+WyHI39AhX3nHQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -527,5 +527,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc= -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/pkg/cmd/get/sorter.go b/pkg/cmd/get/sorter.go index 51bbfee2a..c49d55333 100644 --- a/pkg/cmd/get/sorter.go +++ b/pkg/cmd/get/sorter.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/util/jsonpath" "k8s.io/utils/integer" - "vbom.ml/util/sortorder" + "github.com/fvbommel/sortorder" ) // SortingPrinter sorts list types before delegating to another printer.