Update controller API build tooling
- Update both to their latest versions - Ensure version variable is actually taken into account again... Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
parent
ecd2544bbe
commit
714842e770
8
Makefile
8
Makefile
|
|
@ -38,8 +38,8 @@ FUZZ_TIME ?= 1m
|
||||||
GO_STATIC_FLAGS=-ldflags "-s -w" -tags 'netgo,osusergo,static_build$(addprefix ,,$(GO_TAGS))'
|
GO_STATIC_FLAGS=-ldflags "-s -w" -tags 'netgo,osusergo,static_build$(addprefix ,,$(GO_TAGS))'
|
||||||
|
|
||||||
# API (doc) generation utilities
|
# API (doc) generation utilities
|
||||||
CONTROLLER_GEN_VERSION ?= v0.7.0
|
CONTROLLER_GEN_VERSION ?= v0.11.1
|
||||||
GEN_API_REF_DOCS_VERSION ?= v0.3.0
|
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
|
||||||
|
|
||||||
# If gobin not set, create one on ./build and add to path.
|
# If gobin not set, create one on ./build and add to path.
|
||||||
ifeq (,$(shell go env GOBIN))
|
ifeq (,$(shell go env GOBIN))
|
||||||
|
|
@ -147,13 +147,13 @@ docker-push: ## Push Docker image
|
||||||
CONTROLLER_GEN = $(GOBIN)/controller-gen
|
CONTROLLER_GEN = $(GOBIN)/controller-gen
|
||||||
.PHONY: controller-gen
|
.PHONY: controller-gen
|
||||||
controller-gen: ## Download controller-gen locally if necessary.
|
controller-gen: ## Download controller-gen locally if necessary.
|
||||||
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
|
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION))
|
||||||
|
|
||||||
# Find or download gen-crd-api-reference-docs
|
# Find or download gen-crd-api-reference-docs
|
||||||
GEN_CRD_API_REFERENCE_DOCS = $(GOBIN)/gen-crd-api-reference-docs
|
GEN_CRD_API_REFERENCE_DOCS = $(GOBIN)/gen-crd-api-reference-docs
|
||||||
.PHONY: gen-crd-api-reference-docs
|
.PHONY: gen-crd-api-reference-docs
|
||||||
gen-crd-api-reference-docs: ## Download gen-crd-api-reference-docs locally if necessary
|
gen-crd-api-reference-docs: ## Download gen-crd-api-reference-docs locally if necessary
|
||||||
$(call go-install-tool,$(GEN_CRD_API_REFERENCE_DOCS),github.com/ahmetb/gen-crd-api-reference-docs@3f29e6853552dcf08a8e846b1225f275ed0f3e3b)
|
$(call go-install-tool,$(GEN_CRD_API_REFERENCE_DOCS),github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_API_REF_DOCS_VERSION))
|
||||||
|
|
||||||
ENVTEST = $(GOBIN)/setup-envtest
|
ENVTEST = $(GOBIN)/setup-envtest
|
||||||
.PHONY: envtest
|
.PHONY: envtest
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue