Skip to content

Commit db7ce7e

Browse files
committed
Update controller API build tooling
- Update both to their latest versions - Introduce version variables Signed-off-by: Hidde Beydals <[email protected]>
1 parent db286fe commit db7ce7e

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ BUILD_PLATFORMS ?= linux/amd64
2727
# Architecture to use envtest with
2828
ENVTEST_ARCH ?= amd64
2929

30+
# API (doc) generation utilities
31+
CONTROLLER_GEN_VERSION ?= v0.11.1
32+
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
33+
3034
all: manager
3135

3236
# Run tests
@@ -113,13 +117,13 @@ docker-push:
113117
CONTROLLER_GEN = $(GOBIN)/controller-gen
114118
.PHONY: controller-gen
115119
controller-gen: ## Download controller-gen locally if necessary.
116-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
120+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION))
117121

118122
# Find or download gen-crd-api-reference-docs
119123
GEN_CRD_API_REFERENCE_DOCS = $(GOBIN)/gen-crd-api-reference-docs
120124
.PHONY: gen-crd-api-reference-docs
121-
gen-crd-api-reference-docs:
122-
$(call go-install-tool,$(GEN_CRD_API_REFERENCE_DOCS),github.com/ahmetb/gen-crd-api-reference-docs@v0.3.0)
125+
gen-crd-api-reference-docs: ## Download gen-crd-api-reference-docs locally if necessary
126+
$(call go-install-tool,$(GEN_CRD_API_REFERENCE_DOCS),github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_API_REF_DOCS_VERSION))
123127

124128
ENVTEST_ASSETS_DIR=$(BUILD_DIR)/testbin
125129
ENVTEST_KUBERNETES_VERSION?=latest

config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
88
name: helmreleases.helm.toolkit.fluxcd.io
99
spec:
@@ -876,9 +876,3 @@ spec:
876876
storage: true
877877
subresources:
878878
status: {}
879-
status:
880-
acceptedNames:
881-
kind: ""
882-
plural: ""
883-
conditions: []
884-
storedVersions: []

0 commit comments

Comments
 (0)