Skip to content

Commit b6fccd0

Browse files
authored
Merge pull request #3083 from k8s-infra-cherrypick-robot/cherry-pick-3077-to-release-1.7
[release-1.7] 🌱 Makefile: pin controller-gen binary to go 1.21
2 parents 1a1623b + f022460 commit b6fccd0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,8 @@ $(KIND_BIN): $(KIND) ## Build a local copy of kind.
775775
$(RELEASE_NOTES_BIN): $(RELEASE_NOTES) ## Build a local copy of release-notes.
776776

777777
$(CONTROLLER_GEN): # Build controller-gen.
778-
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(CONTROLLER_GEN_PKG) $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
778+
# controller-gen 0.13 cannot be built with Go >= 1.22. We have to pin it to 1.21.
779+
GOTOOLCHAIN=go1.21.11 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(CONTROLLER_GEN_PKG) $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
779780

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

0 commit comments

Comments
 (0)