Skip to content

Commit 39e73d5

Browse files
authored
Makefile: Remove unused targets/variables (#2567)
Remove the unused "CONTROLLER_GEN" variable that was previously used to generate the CRD manifests before those APIs were moved to the operator-framework/api repository. Update the root Makefile and remove any obvious .PHONY unused targets (or redundant targets). Signed-off-by: timflannagan <[email protected]>
1 parent 7a6de48 commit 39e73d5

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Diff for: Makefile

+4-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ IMAGE_TAG ?= "dev"
2222
SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
2323
LOCAL_NAMESPACE := "olm"
2424
export GO111MODULE=on
25-
CONTROLLER_GEN := go run $(MOD_FLAGS) ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
2625
YQ_INTERNAL := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v3/
2726
KUBEBUILDER_ASSETS := $(or $(or $(KUBEBUILDER_ASSETS),$(dir $(shell command -v kubebuilder))),/usr/local/kubebuilder/bin)
2827
export KUBEBUILDER_ASSETS
@@ -32,9 +31,9 @@ BINDATA := $(GO) run github.com/go-bindata/go-bindata/v3/go-bindata
3231
GIT_COMMIT := $(shell git rev-parse HEAD)
3332

3433
# Phony prerequisite for targets that rely on the go build cache to determine staleness.
35-
.PHONY: build test run clean vendor schema-check \
36-
vendor-update coverage coverage-html e2e \
37-
kubebuilder .FORCE
34+
.PHONY: build test clean vendor \
35+
coverage coverage-html e2e \
36+
kubebuilder
3837

3938
.PHONY: FORCE
4039
FORCE:
@@ -59,9 +58,7 @@ ifeq (, $(wildcard $(KUBEBUILDER_ASSETS)/kube-apiserver))
5958
$(error kube-apiserver $(KUBEBUILDER_ASSETS_ERR))
6059
endif
6160

62-
schema-check:
63-
64-
cover.out: schema-check
61+
cover.out:
6562
go test $(MOD_FLAGS) -tags "json1" -v -race -coverprofile=cover.out -covermode=atomic \
6663
-coverpkg ./pkg/controller/... ./pkg/...
6764

0 commit comments

Comments
 (0)