Skip to content

Commit db826b1

Browse files
committed
Update kubectl to use new vendored github.com/fvbommel/sortorder dependency
The author of this dependency is removing the vanity url and has instructed users to use the GitHub path. This updates the dependency to the module-less pin to the v1 module tag. fvbommel/util#5 fvbommel/util#6 Signed-off-by: Eddie Zaneski <[email protected]>
1 parent ad3891d commit db826b1

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

staging/src/k8s.io/kubectl/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ require (
1313
github.com/evanphx/json-patch v4.9.0+incompatible
1414
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
1515
github.com/fatih/camelcase v1.0.0
16+
github.com/fvbommel/sortorder v1.0.1
1617
github.com/go-openapi/spec v0.19.3
1718
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
1819
github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
@@ -31,7 +32,6 @@ require (
3132
github.com/spf13/cobra v1.0.0
3233
github.com/spf13/pflag v1.0.5
3334
github.com/stretchr/testify v1.4.0
34-
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
3535
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
3636
gopkg.in/yaml.v2 v2.2.8
3737
k8s.io/api v0.0.0
@@ -45,7 +45,6 @@ require (
4545
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
4646
sigs.k8s.io/kustomize v2.0.3+incompatible
4747
sigs.k8s.io/yaml v1.2.0
48-
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
4948
)
5049

5150
replace (

staging/src/k8s.io/kubectl/go.sum

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ go_library(
5555
"//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library",
5656
"//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library",
5757
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
58+
"//vendor/github.com/fvbommel/sortorder:go_default_library",
5859
"//vendor/github.com/liggitt/tabwriter:go_default_library",
5960
"//vendor/github.com/spf13/cobra:go_default_library",
6061
"//vendor/k8s.io/klog/v2:go_default_library",
6162
"//vendor/k8s.io/utils/integer:go_default_library",
6263
"//vendor/k8s.io/utils/pointer:go_default_library",
63-
"//vendor/vbom.ml/util/sortorder:go_default_library",
6464
],
6565
)
6666

staging/src/k8s.io/kubectl/pkg/cmd/get/sorter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/client-go/util/jsonpath"
3434
"k8s.io/utils/integer"
3535

36-
"vbom.ml/util/sortorder"
36+
"github.com/fvbommel/sortorder"
3737
)
3838

3939
// SortingPrinter sorts list types before delegating to another printer.

0 commit comments

Comments
 (0)