Skip to content

Commit 993ce2b

Browse files
authored
Merge pull request #278 from ThatsMrTalbot/feat/helm-tool-for-docs
feat: move to helm-tool for docs
2 parents 74e0c29 + c578511 commit 993ce2b

File tree

7 files changed

+1148
-184
lines changed

7 files changed

+1148
-184
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ KUBEBUILDER_TOOLS_VERISON ?= 1.28.0
2929
KUBECTL_VERSION ?= 1.28.2
3030
KIND_VERSION ?= $(shell grep "sigs.k8s.io/kind" go.mod | awk '{print $$NF}')
3131
GINKGO_VERSION ?= $(shell grep "github.com/onsi/ginkgo/v2" go.mod | awk '{print $$NF}')
32-
HELM_DOCS_VERSION ?= $(shell grep "github.com/norwoodj/helm-docs" hack/tools/go.mod | awk '{print $$NF}')
32+
HELM_TOOL_VERSION ?= $(shell grep "github.com/cert-manager/helm-tool" hack/tools/go.mod | awk '{print $$NF}')
3333
BOILERSUITE_VERSION ?= $(shell grep "github.com/cert-manager/boilersuite" hack/tools/go.mod | awk '{print $$NF}')
3434
CONTROLLER_TOOLS_VERSION ?= $(shell grep "sigs.k8s.io/controller-tools" hack/tools/go.mod | awk '{print $$NF}')
3535
CODE_GENERATOR_VERSION ?= $(shell grep "k8s.io/code-generator" hack/tools/go.mod | awk '{print $$NF}')
@@ -174,8 +174,8 @@ chart: | $(BINDIR)/helm-$(HELM_VERSION)/helm $(BINDIR)/chart
174174
$(BINDIR)/helm-$(HELM_VERSION)/helm package --app-version=$(RELEASE_VERSION) --version=$(RELEASE_VERSION) --destination "$(BINDIR)/chart" ./deploy/charts/trust-manager
175175

176176
.PHONY: update-helm-docs
177-
update-helm-docs: | $(BINDIR)/helm-docs-$(HELM_DOCS_VERSION)/helm-docs ## update Helm README, generated from other Helm files
178-
./hack/update-helm-docs.sh $(BINDIR)/helm-docs-$(HELM_DOCS_VERSION)/helm-docs
177+
update-helm-docs: | $(BINDIR)/helm-tool-$(HELM_TOOL_VERSION)/helm-tool ## update Helm README, generated from other Helm files
178+
./hack/update-helm-tool.sh $(BINDIR)/helm-tool-$(HELM_TOOL_VERSION)/helm-tool
179179

180180
.PHONY: clean
181181
clean: ## clean up created files
@@ -247,7 +247,7 @@ depend: $(BINDIR)/controller-tools-$(CONTROLLER_TOOLS_VERSION)/controller-gen
247247
depend: $(BINDIR)/code-generator-$(CODE_GENERATOR_VERSION)/applyconfiguration-gen
248248
depend: $(BINDIR)/boilersuite-$(BOILERSUITE_VERSION)/boilersuite
249249
depend: $(BINDIR)/kind-$(KIND_VERSION)/kind
250-
depend: $(BINDIR)/helm-docs-$(HELM_DOCS_VERSION)/helm-docs
250+
depend: $(BINDIR)/helm-tool-$(HELM_TOOL_VERSION)/helm-tool
251251
depend: $(BINDIR)/helm-$(HELM_VERSION)/helm
252252
depend: $(BINDIR)/ginkgo-$(GINKGO_VERSION)/ginkgo
253253
depend: $(BINDIR)/kubectl-$(KUBECTL_VERSION)/kubectl
@@ -266,8 +266,8 @@ $(BINDIR)/boilersuite-$(BOILERSUITE_VERSION)/boilersuite: | $(BINDIR)/boilersuit
266266
$(BINDIR)/kind-$(KIND_VERSION)/kind: | $(BINDIR)/kind-$(KIND_VERSION)
267267
cd hack/tools && go build -o $@ sigs.k8s.io/kind
268268

269-
$(BINDIR)/helm-docs-$(HELM_DOCS_VERSION)/helm-docs: | $(BINDIR)/helm-docs-$(HELM_DOCS_VERSION)
270-
cd hack/tools && go build -o $@ github.com/norwoodj/helm-docs/cmd/helm-docs
269+
$(BINDIR)/helm-tool-$(HELM_TOOL_VERSION)/helm-tool: | $(BINDIR)/helm-tool-$(HELM_TOOL_VERSION)
270+
cd hack/tools && go build -o $@ github.com/cert-manager/helm-tool
271271

272272
$(BINDIR)/helm-$(HELM_VERSION)/helm: $(BINDIR)/helm-$(HELM_VERSION)/helm-v$(HELM_VERSION)-$(OS)-$(ARCH).tar.gz | $(BINDIR)
273273
tar xfO $< $(OS)-$(ARCH)/helm > $@ && chmod +x $@
@@ -290,7 +290,7 @@ $(BINDIR)/kubebuilder-$(KUBEBUILDER_TOOLS_VERISON)/kube-apiserver: $(BINDIR)/kub
290290
$(BINDIR)/kubebuilder-$(KUBEBUILDER_TOOLS_VERISON)/envtest-bins.tar.gz: | $(BINDIR)/kubebuilder-$(KUBEBUILDER_TOOLS_VERISON)
291291
curl -sSL -o $@ "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-$(KUBEBUILDER_TOOLS_VERISON)-$(OS)-$(ARCH).tar.gz"
292292

293-
$(BINDIR) $(BINDIR)/kubectl-$(KUBECTL_VERSION) $(BINDIR)/kubebuilder-$(KUBEBUILDER_TOOLS_VERISON) $(BINDIR)/chart $(BINDIR)/ginkgo-$(GINKGO_VERSION) $(BINDIR)/helm-$(HELM_VERSION) $(BINDIR)/helm-docs-$(HELM_DOCS_VERSION) $(BINDIR)/kind-$(KIND_VERSION) $(BINDIR)/boilersuite-$(BOILERSUITE_VERSION) $(BINDIR)/controller-tools-$(CONTROLLER_TOOLS_VERSION) $(BINDIR)/code-generator-$(CODE_GENERATOR_VERSION):
293+
$(BINDIR) $(BINDIR)/kubectl-$(KUBECTL_VERSION) $(BINDIR)/kubebuilder-$(KUBEBUILDER_TOOLS_VERISON) $(BINDIR)/chart $(BINDIR)/ginkgo-$(GINKGO_VERSION) $(BINDIR)/helm-$(HELM_VERSION) $(BINDIR)/helm-tool-$(HELM_TOOL_VERSION) $(BINDIR)/kind-$(KIND_VERSION) $(BINDIR)/boilersuite-$(BOILERSUITE_VERSION) $(BINDIR)/controller-tools-$(CONTROLLER_TOOLS_VERSION) $(BINDIR)/code-generator-$(CODE_GENERATOR_VERSION):
294294
@mkdir -p $@
295295

296296
_FORCE:

0 commit comments

Comments
 (0)