Skip to content

Commit

Permalink
feat(modules): migrate to go modules and bump go version 1.14.4
Browse files Browse the repository at this point in the history
- migrate to go module
- bump go version 1.14.4

Signed-off-by: prateekpandey14 <[email protected]>
  • Loading branch information
prateekpandey14 authored and pawanpraka1 committed Jun 9, 2020
1 parent f5ae3ff commit fa76b34
Show file tree
Hide file tree
Showing 837 changed files with 103,987 additions and 158,161 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- docker
language: go
go:
- 1.12.5
- 1.14.4

addons:
apt:
Expand Down
22 changes: 19 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
# Tools required for different make
# targets or for development purposes
EXTERNAL_TOOLS=\
github.com/golang/dep/cmd/dep \
golang.org/x/tools/cmd/cover \
github.com/axw/gocov/gocov \
gopkg.in/matm/v1/gocov-html \
github.com/ugorji/go/codec/codecgen \
github.com/onsi/ginkgo/ginkgo \
github.com/onsi/gomega/...

Expand Down Expand Up @@ -114,13 +112,31 @@ test: format
@echo "--> Running go test" ;
@go test $(UNIT_TEST_PACKAGES)


.PHONY: deps
deps:
@echo "--> Tidying up submodules"
@go mod tidy
@echo "--> Verifying submodules"
@go mod verify

.PHONY: verify-deps
verify-deps: deps
@if !(git diff --quiet HEAD -- go.sum go.mod); then \
echo "go module files are out of date, please commit the changes to go.mod and go.sum"; exit 1; \
fi

.PHONY: vendor
vendor: go.mod go.sum deps
@go mod vendor

# Bootstrap downloads tools required
# during build
.PHONY: bootstrap
bootstrap: controller-gen
@for tool in $(EXTERNAL_TOOLS) ; do \
echo "+ Installing $$tool" ; \
go get -u $$tool; \
cd && GO111MODULE=on go get $$tool; \
done

.PHONY: controller-gen
Expand Down
22 changes: 22 additions & 0 deletions buildscripts/tools.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// +build tools

/*
copyright 2020 the kubernetes authors.
licensed under the apache license, version 2.0 (the "license");
you may not use this file except in compliance with the license.
you may obtain a copy of the license at
http://www.apache.org/licenses/license-2.0
unless required by applicable law or agreed to in writing, software
distributed under the license is distributed on an "as is" basis,
without warranties or conditions of any kind, either express or implied.
see the license for the specific language governing permissions and
limitations under the license.
*/

// this package imports things required by build scripts, to force `go mod` to see them as dependencies
package tools

import _ "k8s.io/code-generator"
2 changes: 2 additions & 0 deletions buildscripts/travis-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ function checkGitDiff() {
#make golint-travis
#rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi

make verify-deps

echo "Running : make kubegen"
make kubegen
rc=$?; if [[ $rc != 0 ]]; then echo "make kubegen failed"; exit $rc; fi
Expand Down
71 changes: 71 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
module github.com/openebs/zfs-localpv

go 1.14

require (
cloud.google.com/go v0.49.0 // indirect
github.com/Sirupsen/logrus v1.4.2
github.com/container-storage-interface/spec v1.1.0
github.com/docker/go-units v0.4.0
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/ghodss/yaml v1.0.0
github.com/gogo/protobuf v1.3.0 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.3.2
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
github.com/json-iterator/go v1.1.8 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kubernetes-csi/csi-lib-utils v0.6.1
github.com/onsi/ginkgo v1.10.3
github.com/onsi/gomega v1.7.1
github.com/pkg/errors v0.8.1
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/grpc v1.23.1
k8s.io/api v0.15.12
k8s.io/apimachinery v0.15.12
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/code-generator v0.15.12
k8s.io/gengo v0.0.0-20190826232639-a874a240740c // indirect
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
k8s.io/kubernetes v1.15.12
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // indirect
sigs.k8s.io/controller-runtime v0.2.0
)

replace (
github.com/Sirupsen/logrus v1.4.2 => github.com/sirupsen/logrus v1.4.2

k8s.io/api => k8s.io/api v0.15.12
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.15.12
k8s.io/apimachinery => k8s.io/apimachinery v0.15.12
k8s.io/apiserver => k8s.io/apiserver v0.15.12
k8s.io/cli-runtime => k8s.io/cli-runtime v0.15.12
k8s.io/client-go => k8s.io/client-go v0.15.12
k8s.io/cloud-provider => k8s.io/cloud-provider v0.15.12
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.15.12
k8s.io/code-generator => k8s.io/code-generator v0.15.12
k8s.io/component-base => k8s.io/component-base v0.15.12
k8s.io/cri-api => k8s.io/cri-api v0.15.12
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.15.12
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.15.12
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.15.12
k8s.io/kube-proxy => k8s.io/kube-proxy v0.15.12
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.15.12
k8s.io/kubectl => k8s.io/kubectl v0.15.12
k8s.io/kubelet => k8s.io/kubelet v0.15.12
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.15.12
k8s.io/metrics => k8s.io/metrics v0.15.12
k8s.io/node-api => k8s.io/node-api v0.15.12
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.15.12
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.15.12
k8s.io/sample-controller => k8s.io/sample-controller v0.15.12
)
Loading

0 comments on commit fa76b34

Please sign in to comment.