Cleanup glide (#1353)

* Cleanup mentions about glide

* Don't use glide to ignore vendor directory

Since go-1.9, "./..." no longer contains the "vendor" directory.
Also, since #1305 migrated dependency management from glide to go mod,
there is no need to think about the "vendor" directory.

See: https://golang.org/doc/go1.9#vendor-dotdotdot

* go mod tidy

Author: namusyaka

CONTRIBUTING.md

@@ -25,4 +25,4 @@ Note: Code-related PR's require one ACK / LGTM from a maintainer or core contrib
 
 ### Adding dependencies
 
-If your patch depends on new packages, add that package with [`glide`](https://github.com/Masterminds/glide). Follow the [instructions to add a dependency](https://github.com/kubernetes/kompose/blob/master/docs/development.md#glide-glide-vc-and-dependency-management).
+If your patch depends on new packages, make sure that both `go.mod` and `go.sum` are updated properly. Also we recommend you to execute `go mod tidy` before sending a pull request.

Jenkinsfile

@@ -6,7 +6,7 @@ goTemplate{
         githubOrganisation = 'kubernetes'
         dockerOrganisation = 'fabric8'
         project = 'kompose'
-        makeCommand = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/usr/local/glide:/usr/local/:/go/bin:/home/jenkins/go/bin \
+        makeCommand = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/usr/local/:/go/bin:/home/jenkins/go/bin \
                        && bash script/test/cmd/fix_detached_head.sh && make test"
       }
   }

Makefile

@@ -16,7 +16,6 @@
 
 GITCOMMIT := $(shell git rev-parse --short HEAD)
 BUILD_FLAGS := -ldflags="-w -s -X github.com/kubernetes/kompose/pkg/version.GITCOMMIT=$(GITCOMMIT)"
-PKGS = $(shell glide novendor)
 TEST_IMAGE := kompose/tests:latest
 
 default: bin
@@ -48,13 +47,13 @@ clean:
 
 .PHONY: test-unit
 test-unit:
-	go test -short $(BUILD_FLAGS) -race -cover -v $(PKGS)
+	go test -short $(BUILD_FLAGS) -race -cover -v ./...
 
 # Run unit tests and collect coverage
 .PHONY: test-unit-cover
 test-unit-cover:
 	# First install packages that are dependencies of the test.
-	go test -short -i -race -cover $(PKGS)
+	go test -short -i -race -cover ./...
 	# go test doesn't support colleting coverage across multiple packages,
 	# generate go test commands using go list and run go test for every package separately
 	go list -f '"go test -short -race -cover -v -coverprofile={{.Dir}}/.coverprofile {{.ImportPath}}"' github.com/kubernetes/kompose/...  | grep -v "vendor" | xargs -L 1 -P4 sh -c
@@ -91,11 +90,6 @@ lint:
 gofmt:
 	./script/check-gofmt.sh
 
-# Checks if there are nested vendor dirs inside Kompose vendor and if vendor was cleaned by glide-vc
-.PHONY: check-vendor
-check-vendor:
-	./script/check-vendor.sh
-
 # Run all tests
 .PHONY: test
 test: bin test-dep  validate test-unit-cover install test-cmd

docs/development.md

@@ -53,58 +53,16 @@ git push -f origin myfeature
 2. Click the "Compare and pull request" button next to your "myfeature" branch.
 3. Check out the pull request process for more details
 
-## `glide`, `glide-vc` and dependency management
-
-Kompose uses `glide` to manage dependencies and `glide-vc` to clean vendor directory.
-They are not strictly required for building Kompose but they are required when managing dependencies under the `vendor/` directory.
-If you want to make changes to dependencies please make sure that `glide` and `glide-vc` are installed and are in your `$PATH`.
-
-### Installing glide
-
-There are many ways to build and host golang binaries. Here is an easy way to get utilities like `glide` and `glide-vc` installed:
-
-Ensure that Mercurial and Git are installed on your system. (some of the dependencies use the mercurial source control system).
-Use `apt-get install mercurial git` or `yum install mercurial git` on Linux, or `brew.sh` on OS X, or download them directly.
-
-```console
-go get -u github.com/Masterminds/glide
-go get github.com/sgotti/glide-vc
-```
-
-Check that `glide` and `glide-vc` commands are working.
-
-```console
-glide --version
-glide-vc -h
-```
-
-### Using glide
-
-#### Adding new dependency
-1. Update `glide.yml` file.
-
-  Add new packages or subpackages to `glide.yml` depending if you added whole new package as dependency or
-  just new subpackage.
-
-2. Run `glide update --strip-vendor` to get new dependencies.
-   Then run `glide-vc --only-code --no-tests` to delete all unnecessary files from vendor.
-
-3. Commit updated `glide.yml`, `glide.lock` and `vendor` to git.
-
-
-#### Updating dependencies
-
-1. Set new package version in  `glide.yml` file.
-
-2. Run `glide update --strip-vendor` to update dependencies.
-   Then run `glide-vc --only-code --no-tests` to delete all unnecessary files from vendor.
+## Go Modules and dependency management
 
+Kompose uses [Go Modules](https://github.com/golang/go/wiki/Modules) to manage dependencies.
+If you want to make changes to dependencies please make sure that `go.mod` and `go.sum` are updated properly.
 
 ##### Updating Kubernetes and OpenShift
 Kubernetes version depends on what version is OpenShift using.
 OpenShift is using forked Kubernetes to carry some patches.
 Currently it is not possible to use different Kubernetes version from version that OpenShift uses.
-(for more see comments in `glide.yml`)
+(for more see comments in `go.mod`)
 
 ### Adding CLI tests
 

go.mod

@@ -17,31 +17,25 @@ replace github.com/containerd/containerd => github.com/containerd/containerd v1.
 replace golang.org/x/sys => golang.org/x/sys v0.0.0-20201029080932-201ba4db2418
 
 require (
-	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/docker/cli v0.0.0-20190711175710-5b38d82aa076
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/libcompose v0.4.0
 	github.com/fatih/structs v1.1.0
 	github.com/fsouza/go-dockerclient v1.6.5
 	github.com/google/go-cmp v0.4.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
 	github.com/imdario/mergo v0.3.10 // indirect
 	github.com/joho/godotenv v1.3.0
-	github.com/mattn/goveralls v0.0.7 // indirect
-	github.com/mitchellh/gox v1.0.1 // indirect
 	github.com/moby/sys/mount v0.1.1 // indirect
 	github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2 // indirect
-	github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 // indirect
 	github.com/novln/docker-parser v1.0.0
-	github.com/opencontainers/selinux v1.6.0 // indirect
 	github.com/openshift/api v0.0.0-20200803131051-87466835fcc0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.7.1
-	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
 	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 	gotest.tools/v3 v3.0.3 // indirect