Skip to content

Commit daceef3

Browse files
Makefile: remove unnecessary controller-gen & generate targets (#8)
1 parent 6569ba6 commit daceef3

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

Makefile

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ endif
1313
all: manager
1414

1515
# Run tests
16-
test: generate fmt vet testbin
16+
test: fmt vet testbin
1717
go test -race -covermode atomic -coverprofile cover.out ./...
1818

1919
# Build manager binary
20-
manager: generate fmt vet
20+
manager: fmt vet
2121
go build -o bin/manager main.go
2222

2323
# Run go fmt against code
@@ -31,10 +31,6 @@ vet:
3131
lint: golangci-lint
3232
$(GOLANGCI_LINT) run
3333

34-
# Generate code
35-
generate: controller-gen
36-
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
37-
3834
# Build the docker image
3935
docker-build: test
4036
docker build . -t ${IMG}
@@ -56,24 +52,6 @@ else
5652
GOLANGCI_LINT=$(shell which golangci-lint)
5753
endif
5854

59-
60-
# find or download controller-gen
61-
# download controller-gen if necessary
62-
controller-gen:
63-
ifeq (, $(shell which controller-gen))
64-
@{ \
65-
set -e ;\
66-
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
67-
cd $$CONTROLLER_GEN_TMP_DIR ;\
68-
go mod init tmp ;\
69-
go get sigs.k8s.io/controller-tools/cmd/[email protected] ;\
70-
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
71-
}
72-
CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
73-
else
74-
CONTROLLER_GEN=$(shell which controller-gen)
75-
endif
76-
7755
K8S_VER ?= v1.18.2
7856
ETCD_VER ?= v3.4.3
7957
OS=$(shell uname -s | tr '[:upper:]' '[:lower:]')

0 commit comments

Comments
 (0)