Skip to content

Commit

Permalink
Merge pull request #865 from jakobmoellerdev/pin-setup-envtest
Browse files Browse the repository at this point in the history
fix: pin setup-envtest to go 1.20 before TopoLVM migrates to go 1.21
  • Loading branch information
daichimukai committed Mar 27, 2024
2 parents 2597dc7 + 138769a commit ecfadb5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,7 @@ install-helm-docs: | $(BINDIR)
tools: install-kind install-container-structure-test install-helm install-helm-docs | $(BINDIR) ## Install development tools.
GOBIN=$(BINDIR) go install honnef.co/go/tools/cmd/staticcheck@latest
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION)
# Follow the official documentation to install the `latest` version, because explicitly specifying the version will get an error.
GOBIN=$(BINDIR) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
GOBIN=$(BINDIR) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)
GOBIN=$(BINDIR) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v$(CONTROLLER_TOOLS_VERSION)

$(CURL) -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION)-linux-x86_64.zip
Expand Down
3 changes: 3 additions & 0 deletions versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ MINIKUBE_VERSION := v1.32.0
# https://github.com/protocolbuffers/protobuf/releases
PROTOC_VERSION := 25.2

# https://github.com/kubernetes-sigs/controller-runtime/tree/main/tools/setup-envtest
# Usually on latest, but might need to be pinned from time to time
ENVTEST_VERSION := bf15e44028f908c790721fc8fe67c7bf2d06a611
ENVTEST_KUBERNETES_VERSION := $(shell echo $(KUBERNETES_VERSION) | cut -d "." -f 1-2)

# Tools versions which are defined in go.mod
Expand Down

0 comments on commit ecfadb5

Please sign in to comment.