Skip to content

Commit 739fbe3

Browse files
authored
Merge pull request #1677 from shiftstack/defaulter-gen
🌱 Remove defaulter-gen
2 parents 686923c + 35a742b commit 739fbe3

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ GO_INSTALL := ./scripts/go_install.sh
4444
# Binaries.
4545
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
4646
CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
47-
DEFAULTER_GEN := $(TOOLS_BIN_DIR)/defaulter-gen
4847
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
4948
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
5049
GOJQ := $(TOOLS_BIN_DIR)/gojq
@@ -262,7 +261,7 @@ generate: ## Generate code
262261

263262
.PHONY: generate-go
264263
generate-go: $(MOCKGEN)
265-
$(MAKE) -B $(CONTROLLER_GEN) $(CONVERSION_GEN) $(DEFAULTER_GEN)
264+
$(MAKE) -B $(CONTROLLER_GEN) $(CONVERSION_GEN)
266265
$(CONTROLLER_GEN) \
267266
paths=./api/... \
268267
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt

hack/tools/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ CONVERSION_GEN := $(BIN_DIR)/conversion-gen
6969
$(CONVERSION_GEN): go.mod go.sum | $(BIN_DIR)
7070
go build -tags=tools -o $@ k8s.io/code-generator/cmd/conversion-gen
7171

72-
DEFAULTER_GEN := $(BIN_DIR)/defaulter-gen
73-
$(DEFAULTER_GEN): go.mod go.sum | $(BIN_DIR)
74-
go build -tags=tools -o $@ k8s.io/code-generator/cmd/defaulter-gen
75-
7672
ENVSUBST := $(BIN_DIR)/envsubst
7773
$(ENVSUBST): go.mod go.sum | $(BIN_DIR) # Build envsubst from tools folder.
7874
go build -tags=tools -o $@ github.com/a8m/envsubst/cmd/envsubst

0 commit comments

Comments
 (0)