Skip to content

Commit 179e183

Browse files
committed
fixup! DROPME: use controller-gen from fork
1 parent 560dd76 commit 179e183

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ SETUP_ENVTEST_BIN := setup-envtest
113113
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
114114
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
115115

116-
CONTROLLER_GEN_VER := 28f149a996f13a897b7b60ad18f4080b9a183ff9
116+
CONTROLLER_GEN_VER := 8e10d2c621f3468a5570bfcc9f49ca3a39001872
117117
CONTROLLER_GEN_BIN := controller-gen
118118
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
119119
CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -1407,7 +1407,7 @@ $(GOVULNCHECK_BIN): $(GOVULNCHECK) ## Build a local copy of govulncheck.
14071407
$(IMPORT_BOSS_BIN): $(IMPORT_BOSS)
14081408

14091409
$(CONTROLLER_GEN): # Build controller-gen from tools folder.
1410-
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL_FORK) $(CONTROLLER_GEN_PKG) $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER) $(CONTROLLER_GEN_PKG_REPLACE)
1410+
GOTOOLCHAIN=go1.24.1 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL_FORK) $(CONTROLLER_GEN_PKG) $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER) $(CONTROLLER_GEN_PKG_REPLACE)
14111411

14121412
## We are forcing a rebuilt of conversion-gen via PHONY so that we're always using an up-to-date version.
14131413
## We can't use a versioned name for the binary, because that would be reflected in generated files.

0 commit comments

Comments
 (0)