Skip to content

Commit f72d14c

Browse files
committed
Makefile: Remove unused targets/variables
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 e6428a1 commit f72d14c

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Makefile

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

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

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

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

0 commit comments

Comments
 (0)