Merge pull request #9333 from k8s-infra-cherrypick-robot/cherry-pick-…

…9328-to-release-1.4 [release-1.4] 🌱 Use official plantuml image for diagrams
kubernetes-sigs · Aug 29, 2023 · 38a968f · 38a968f
2 parents 362a9ad + 1401443
commit 38a968f
Show file tree

Hide file tree

Showing 51 changed files with 13 additions and 76 deletions.
diff --git a/Makefile b/Makefile
@@ -59,6 +59,7 @@ BIN_DIR := bin
 TEST_DIR := test
 TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/$(BIN_DIR))
+DOCS_DIR := docs
 E2E_FRAMEWORK_DIR := $(TEST_DIR)/framework
 CAPD_DIR := $(TEST_DIR)/infrastructure/docker
 TEST_EXTENSION_DIR := $(TEST_DIR)/extension
@@ -153,6 +154,8 @@ YQ_BIN := yq
 YQ :=  $(abspath $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER))
 YQ_PKG := github.com/mikefarah/yq/v4
 
+PLANTUML_VER := 1.2023
+
 GINKGO_BIN := ginkgo
 GINGKO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2)
 GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINGKO_VER))
@@ -544,7 +547,16 @@ generate-metrics-config: $(ENVSUBST_BIN) ## Generate ./hack/observability/kube-s
 
 .PHONY: generate-diagrams
 generate-diagrams: ## Generate diagrams for *.plantuml files
-	$(MAKE) -C docs diagrams
+	$(MAKE) generate-diagrams-book
+	$(MAKE) generate-diagrams-proposals
+
+.PHONY: generate-diagrams-book
+generate-diagrams-book: ## Generate diagrams for *.plantuml files in book
+	docker run -v $(ROOT_DIR)/$(DOCS_DIR):/$(DOCS_DIR)$(DOCKER_VOL_OPTS)  plantuml/plantuml:$(PLANTUML_VER) /$(DOCS_DIR)/book/**/*.plantuml
+
+.PHONY: generate-diagrams-proposals
+generate-diagrams-proposals: ## Generate diagrams for *.plantuml files in proposals
+	docker run -v $(ROOT_DIR)/$(DOCS_DIR):/$(DOCS_DIR)$(DOCKER_VOL_OPTS)  plantuml/plantuml:$(PLANTUML_VER) /$(DOCS_DIR)/proposals/**/*.plantuml
 
 ## --------------------------------------
 ## Lint / Verify

diff --git a/docs/Dockerfile b/docs/Dockerfile
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/book/src/images/bootstrap-controller.png b/docs/book/src/images/bootstrap-controller.png
diff --git a/docs/book/src/images/bootstrap-provider.png b/docs/book/src/images/bootstrap-provider.png
diff --git a/docs/book/src/images/cluster-admission-cluster-controller.png b/docs/book/src/images/cluster-admission-cluster-controller.png
diff --git a/docs/book/src/images/cluster-admission-machine-controller.png b/docs/book/src/images/cluster-admission-machine-controller.png
diff --git a/docs/book/src/images/cluster-admission-machinedeployment-controller.png b/docs/book/src/images/cluster-admission-machinedeployment-controller.png
diff --git a/docs/book/src/images/cluster-admission-machinepool-controller.png b/docs/book/src/images/cluster-admission-machinepool-controller.png
diff --git a/docs/book/src/images/cluster-admission-machineset-controller.png b/docs/book/src/images/cluster-admission-machineset-controller.png
diff --git a/docs/book/src/images/cluster-infra-provider.png b/docs/book/src/images/cluster-infra-provider.png
diff --git a/docs/book/src/images/cluster-resource-set-controller.png b/docs/book/src/images/cluster-resource-set-controller.png
diff --git a/docs/book/src/images/cluster-topology-controller.png b/docs/book/src/images/cluster-topology-controller.png
diff --git a/docs/book/src/images/cluster-topology-reconciller.png b/docs/book/src/images/cluster-topology-reconciller.png
diff --git a/docs/book/src/images/control-plane-controller.png b/docs/book/src/images/control-plane-controller.png
diff --git a/docs/book/src/images/kubeadm-control-plane-machines-resources.png b/docs/book/src/images/kubeadm-control-plane-machines-resources.png
diff --git a/docs/book/src/images/machine-infra-provider.png b/docs/book/src/images/machine-infra-provider.png
diff --git a/docs/book/src/images/machinehealthcheck-controller.png b/docs/book/src/images/machinehealthcheck-controller.png
diff --git a/docs/book/src/images/management-workload-same-cluster.png b/docs/book/src/images/management-workload-same-cluster.png
diff --git a/docs/book/src/images/management-workload-separate-clusters.png b/docs/book/src/images/management-workload-separate-clusters.png
diff --git a/docs/book/src/images/runtime-sdk-topology-mutation.png b/docs/book/src/images/runtime-sdk-topology-mutation.png
diff --git a/docs/book/src/images/worker-machines-resources.png b/docs/book/src/images/worker-machines-resources.png
diff --git a/docs/proposals/images/capi-provider-operator/fig1.png b/docs/proposals/images/capi-provider-operator/fig1.png
diff --git a/docs/proposals/images/capi-provider-operator/fig2.png b/docs/proposals/images/capi-provider-operator/fig2.png
diff --git a/docs/proposals/images/cluster-class/create.png b/docs/proposals/images/cluster-class/create.png
diff --git a/docs/proposals/images/cluster-class/update.png b/docs/proposals/images/cluster-class/update.png
diff --git a/docs/proposals/images/cluster-spec-crds/figure1.png b/docs/proposals/images/cluster-spec-crds/figure1.png
diff --git a/docs/proposals/images/cluster-spec-crds/figure2.png b/docs/proposals/images/cluster-spec-crds/figure2.png
diff --git a/docs/proposals/images/clusterctl-extensible-templates/pkgCalls.png b/docs/proposals/images/clusterctl-extensible-templates/pkgCalls.png
diff --git a/docs/proposals/images/clusterctl-extensible-templates/templateClient.png b/docs/proposals/images/clusterctl-extensible-templates/templateClient.png
diff --git a/docs/proposals/images/clusterctl-extensible-templates/yamlProcessor.png b/docs/proposals/images/clusterctl-extensible-templates/yamlProcessor.png
diff --git a/docs/proposals/images/clusterctl-redesign/config.png b/docs/proposals/images/clusterctl-redesign/config.png
diff --git a/docs/proposals/images/clusterctl-redesign/init.png b/docs/proposals/images/clusterctl-redesign/init.png
diff --git a/docs/proposals/images/controlplane/controlplane-init-1.png b/docs/proposals/images/controlplane/controlplane-init-1.png
diff --git a/docs/proposals/images/controlplane/controlplane-init-2.png b/docs/proposals/images/controlplane/controlplane-init-2.png
diff --git a/docs/proposals/images/controlplane/controlplane-init-3.png b/docs/proposals/images/controlplane/controlplane-init-3.png
diff --git a/docs/proposals/images/controlplane/controlplane-init-4.png b/docs/proposals/images/controlplane/controlplane-init-4.png
diff --git a/docs/proposals/images/controlplane/controlplane-init-6.png b/docs/proposals/images/controlplane/controlplane-init-6.png
diff --git a/docs/proposals/images/controlplane/controlplane-init-7.png b/docs/proposals/images/controlplane/controlplane-init-7.png
diff --git a/docs/proposals/images/developer/diagram.png b/docs/proposals/images/developer/diagram.png
diff --git a/docs/proposals/images/kubelet-authentication/client-authenticator-flow.png b/docs/proposals/images/kubelet-authentication/client-authenticator-flow.png
diff --git a/docs/proposals/images/machine-health-check/mhc.png b/docs/proposals/images/machine-health-check/mhc.png
diff --git a/docs/proposals/images/machine-states-preboot/Figure3.png b/docs/proposals/images/machine-states-preboot/Figure3.png
diff --git a/docs/proposals/images/machine-states-preboot/Figure4.png b/docs/proposals/images/machine-states-preboot/Figure4.png
diff --git a/docs/proposals/images/machine-states-preboot/Figure5.png b/docs/proposals/images/machine-states-preboot/Figure5.png
diff --git a/docs/proposals/images/machine-states-preboot/Figure6.png b/docs/proposals/images/machine-states-preboot/Figure6.png
diff --git a/docs/proposals/images/machine-states-preboot/Figure7.png b/docs/proposals/images/machine-states-preboot/Figure7.png
diff --git a/docs/proposals/images/machine-states-preboot/Figure8.png b/docs/proposals/images/machine-states-preboot/Figure8.png
diff --git a/docs/proposals/images/machinepool-api/figure1.png b/docs/proposals/images/machinepool-api/figure1.png
diff --git a/docs/proposals/images/machinepool-machines/infraref-changed-sequence.png b/docs/proposals/images/machinepool-machines/infraref-changed-sequence.png
diff --git a/docs/proposals/images/topology-mutation-hook/topology-reconciliation.png b/docs/proposals/images/topology-mutation-hook/topology-reconciliation.png