Skip to content

Commit bd336eb

Browse files
authored
Merge pull request #9328 from killianmuldoon/pr-update-plantuml
🌱 Use official plantuml image for diagrams
2 parents 8cb4d00 + 15ed517 commit bd336eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+13
-76
lines changed

Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ BIN_DIR := bin
5959
TEST_DIR := test
6060
TOOLS_DIR := hack/tools
6161
TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/$(BIN_DIR))
62+
DOCS_DIR := docs
6263
E2E_FRAMEWORK_DIR := $(TEST_DIR)/framework
6364
CAPD_DIR := $(TEST_DIR)/infrastructure/docker
6465
CAPIM_DIR := $(TEST_DIR)/infrastructure/inmemory
@@ -154,6 +155,8 @@ YQ_BIN := yq
154155
YQ := $(abspath $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER))
155156
YQ_PKG := github.com/mikefarah/yq/v4
156157

158+
PLANTUML_VER := 1.2023
159+
157160
GINKGO_BIN := ginkgo
158161
GINGKO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2)
159162
GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINGKO_VER))
@@ -571,7 +574,16 @@ generate-metrics-config: $(ENVSUBST_BIN) ## Generate ./hack/observability/kube-s
571574

572575
.PHONY: generate-diagrams
573576
generate-diagrams: ## Generate diagrams for *.plantuml files
574-
$(MAKE) -C docs diagrams
577+
$(MAKE) generate-diagrams-book
578+
$(MAKE) generate-diagrams-proposals
579+
580+
.PHONY: generate-diagrams-book
581+
generate-diagrams-book: ## Generate diagrams for *.plantuml files in book
582+
docker run -v $(ROOT_DIR)/$(DOCS_DIR):/$(DOCS_DIR)$(DOCKER_VOL_OPTS) plantuml/plantuml:$(PLANTUML_VER) /$(DOCS_DIR)/book/**/*.plantuml
583+
584+
.PHONY: generate-diagrams-proposals
585+
generate-diagrams-proposals: ## Generate diagrams for *.plantuml files in proposals
586+
docker run -v $(ROOT_DIR)/$(DOCS_DIR):/$(DOCS_DIR)$(DOCKER_VOL_OPTS) plantuml/plantuml:$(PLANTUML_VER) /$(DOCS_DIR)/proposals/**/*.plantuml
575587

576588

577589
## --------------------------------------

docs/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/Makefile

Lines changed: 0 additions & 50 deletions
This file was deleted.
15.2 KB
1.77 KB
4.3 KB
6.17 KB
17.7 KB
8.17 KB
4.85 KB

0 commit comments

Comments
 (0)