[7.0.x] Fix sortorder dep (#2085)

gravitational · Sep 3, 2020 · 07335ab · 07335ab
1 parent dba7a64
commit 07335ab
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 19 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -21,19 +21,25 @@
 # version = "2.4.0"
 
 required = [
- "k8s.io/code-generator"
+ "k8s.io/code-generator",
+ "github.com/fvbommel/sortorder"
 ]
 
 ignored = [
  "github.com/gravitational/gravity/build/*",
  "github.com/gravitational/gravity/e/build/*",
- "github.com/gravitational/gravity/lib/system/selinux/generate"
+ "github.com/gravitational/gravity/lib/system/selinux/generate",
+ "vbom.ml/util/sortorder"
 ]
 
 [prune]
  unused-packages = true
  go-tests = true
 
+[[override]]
+ name = "github.com/fvbommel/sortorder"
+ source = "github.com/fvbommel/sortorder"
+
 [[override]]
  name = "github.com/gravitational/trace"
  version = "=1.1.11"

diff --git a/Makefile b/Makefile
@@ -814,4 +814,20 @@ clean-codegen:
 selinux:
  $(MAKE) -C build.assets selinux
 
+#
+# this is a temporary target until we upgrade k8s.io packages
+# to use fvbommel/sortorder.
+# https://github.com/fvbommel/util/issues/6
+#
+.PHONY: dep-ensure
+dep-ensure:
+ dep version
+ dep ensure -v
+ dep status -v
+ $(MAKE) fix-sortorder
+
+.PHONY: fix-sortorder
+fix-sortorder:
+ find vendor -name '*.go' -type f -print0 | xargs -0 sed -i 's/vbom.ml\/util/github.com\/fvbommel/g'
+
 include build.assets/etcd.mk
diff --git a/vendor/github.com/fvbommel/sortorder/.gitignore b/vendor/github.com/fvbommel/sortorder/.gitignore
diff --git a/vendor/vbom.ml/util/LICENSE → vendor/github.com/fvbommel/sortorder/LICENSE b/vendor/vbom.ml/util/LICENSE → vendor/github.com/fvbommel/sortorder/LICENSE
diff --git a/vendor/github.com/fvbommel/sortorder/README.md b/vendor/github.com/fvbommel/sortorder/README.md
diff --git a/vendor/vbom.ml/util/sortorder/doc.go → vendor/github.com/fvbommel/sortorder/doc.go b/vendor/vbom.ml/util/sortorder/doc.go → vendor/github.com/fvbommel/sortorder/doc.go
diff --git a/vendor/github.com/fvbommel/sortorder/go.mod b/vendor/github.com/fvbommel/sortorder/go.mod
diff --git a/vendor/github.com/fvbommel/sortorder/go.sum b/vendor/github.com/fvbommel/sortorder/go.sum
diff --git a/vendor/vbom.ml/util/sortorder/natsort.go → .../github.com/fvbommel/sortorder/natsort.go b/vendor/vbom.ml/util/sortorder/natsort.go → .../github.com/fvbommel/sortorder/natsort.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/sorter.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/sorter.go
diff --git a/vendor/vbom.ml/util/sortorder/README.md b/vendor/vbom.ml/util/sortorder/README.md