Skip to content

Commit

Permalink
Drop gobin and vendor tools instead
Browse files Browse the repository at this point in the history
  • Loading branch information
spangenberg committed Aug 26, 2019
1 parent 40d9ea7 commit ee220eb
Show file tree
Hide file tree
Showing 10 changed files with 1,718 additions and 19 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ else
IMAGE_BUILD_CMD = docker build
endif

.PHONY: bootstrap
bootstrap:
GO111MODULE=off go get -u github.com/myitcv/gobin

.PHONY: vendor
vendor:
go mod tidy
Expand All @@ -56,7 +52,7 @@ vendor:

.PHONY: generate
generate:
GOFLAGS=-mod=readonly go generate ./pkg/... ./cmd/...
go generate ./pkg/... ./cmd/...

.PHONY: test
test: unit
Expand Down
14 changes: 3 additions & 11 deletions hack/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@

set -euo pipefail

GO111MODULE = off
export GO111MODULE
GOFLAGS =
export GOFLAGS
unset GOFLAGS

GOPATH="$(mktemp -d)"
export GOPATH
git clone "https://github.com/openshift/cluster-api-actuator-pkg.git" cluster-api-actuator-pkg

ACTUATOR_PKG="github.com/openshift/cluster-api-actuator-pkg"

go get -u -d "${ACTUATOR_PKG}/..."

exec make -C "${GOPATH}/src/${ACTUATOR_PKG}" test-e2e
exec make -C cluster-api-actuator-pkg test-e2e
2 changes: 1 addition & 1 deletion pkg/apis/apis.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

// Generate deepcopy for apis
//go:generate gobin -m -run k8s.io/code-generator/cmd/deepcopy-gen -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate/boilerplate.go.txt
//go:generate go run ../../vendor/k8s.io/code-generator/cmd/deepcopy-gen -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate/boilerplate.go.txt

// Package apis contains Kubernetes API groups.
package apis
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/aws/aws-sdk-go/service/elbv2/elbv2iface"
)

//go:generate gobin -m -run github.com/golang/mock/mockgen -source=./client.go -destination=./mock/client_generated.go -package=mock
//go:generate go run ../../vendor/github.com/golang/mock/mockgen -source=./client.go -destination=./mock/client_generated.go -package=mock

const (
// AwsCredsSecretIDKey is secret key containing AWS KeyId
Expand Down
2 changes: 1 addition & 1 deletion tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package tools

import (
_ "github.com/golang/mock"
_ "github.com/golang/mock/mockgen"
_ "github.com/openshift/cluster-api/cmd/manager"
_ "k8s.io/code-generator/cmd/deepcopy-gen"
)
Loading

0 comments on commit ee220eb

Please sign in to comment.