This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.4.x by this push:
new 12efd36 #2852 Update Antora usage and move diagram source to more
appropriate location
12efd36 is described below
commit 12efd364579a13ba271940ecdf52fd4c203fb7de
Author: David Jencks <djen...@apache.org>
AuthorDate: Wed Jan 5 15:17:15 2022 -0800
#2852 Update Antora usage and move diagram source to more appropriate
location
---
docs/diagrams-source/README.adoc | 4 ++++
.../camel-k-operator-control-loop.drawio | 0
.../camel-k-state-machine-basic.drawio | 0
.../camel-k-state-machine-build.drawio | 0
.../camel-k-state-machine-integration-platform.drawio | 0
.../camel-k-state-machine-integration.drawio | 0
.../camel-k-state-machine-integrationkit.drawio | 0
.../operator-control-loop.drawio | 0
docs/modules/ROOT/assets/diagrams/README.adoc | 4 ----
.../{assets => }/attachments/schema/integration-schema.json | 0
.../{assets => }/attachments/schema/kamelet-schema.json | 0
.../attachments/tekton/camel-k-pipeline-permissions.yaml | 0
.../tekton/camel-k-pipeline-task-definition.yaml | 0
.../attachments/tekton/camel-k-pipeline-task-run.yaml | 0
.../{assets => }/images/architecture/camel-k-high-level.svg | 0
.../images/architecture/camel-k-operator-control-loop.png | Bin
.../{assets => }/images/architecture/camel-k-operator.jpg | Bin
.../{assets => }/images/architecture/camel-k-runtimes.jpg | Bin
.../images/architecture/camel-k-sources-diagram.png | Bin
.../images/architecture/camel-k-state-machine-basic.png | Bin
.../images/architecture/camel-k-state-machine-build.png | Bin
.../camel-k-state-machine-integration-platform.png | Bin
.../architecture/camel-k-state-machine-integration.png | Bin
.../architecture/camel-k-state-machine-integrationkit.png | Bin
.../{assets => }/images/architecture/camel-k-traits.jpg | Bin
.../ROOT/{assets => }/images/architecture/camel-k.jpg | Bin
.../images/architecture/operator-control-loop.png | Bin
.../ROOT/{assets => }/images/debugging/remote-debugger.png | Bin
.../images/tekton/tekton-pipeline-definition.png | Bin
.../{assets => }/images/tekton/tekton-pipeline-result.png | Bin
.../ROOT/{assets => }/images/tekton/tekton-pipeline-run.png | Bin
docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc | 6 +++---
32 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/diagrams-source/README.adoc b/docs/diagrams-source/README.adoc
new file mode 100644
index 0000000..1ff183b
--- /dev/null
+++ b/docs/diagrams-source/README.adoc
@@ -0,0 +1,4 @@
+= Diagrams
+
+This directory contains the source for many of the images in the ROOT module,
in .drawio format.
+The files are generated by https://app.diagrams.net and may be loaded and
modified there.
diff --git
a/docs/modules/ROOT/assets/diagrams/camel-k-operator-control-loop.drawio
b/docs/diagrams-source/camel-k-operator-control-loop.drawio
similarity index 100%
rename from
docs/modules/ROOT/assets/diagrams/camel-k-operator-control-loop.drawio
rename to docs/diagrams-source/camel-k-operator-control-loop.drawio
diff --git
a/docs/modules/ROOT/assets/diagrams/camel-k-state-machine-basic.drawio
b/docs/diagrams-source/camel-k-state-machine-basic.drawio
similarity index 100%
rename from docs/modules/ROOT/assets/diagrams/camel-k-state-machine-basic.drawio
rename to docs/diagrams-source/camel-k-state-machine-basic.drawio
diff --git
a/docs/modules/ROOT/assets/diagrams/camel-k-state-machine-build.drawio
b/docs/diagrams-source/camel-k-state-machine-build.drawio
similarity index 100%
rename from docs/modules/ROOT/assets/diagrams/camel-k-state-machine-build.drawio
rename to docs/diagrams-source/camel-k-state-machine-build.drawio
diff --git
a/docs/modules/ROOT/assets/diagrams/camel-k-state-machine-integration-platform.drawio
b/docs/diagrams-source/camel-k-state-machine-integration-platform.drawio
similarity index 100%
rename from
docs/modules/ROOT/assets/diagrams/camel-k-state-machine-integration-platform.drawio
rename to docs/diagrams-source/camel-k-state-machine-integration-platform.drawio
diff --git
a/docs/modules/ROOT/assets/diagrams/camel-k-state-machine-integration.drawio
b/docs/diagrams-source/camel-k-state-machine-integration.drawio
similarity index 100%
rename from
docs/modules/ROOT/assets/diagrams/camel-k-state-machine-integration.drawio
rename to docs/diagrams-source/camel-k-state-machine-integration.drawio
diff --git
a/docs/modules/ROOT/assets/diagrams/camel-k-state-machine-integrationkit.drawio
b/docs/diagrams-source/camel-k-state-machine-integrationkit.drawio
similarity index 100%
rename from
docs/modules/ROOT/assets/diagrams/camel-k-state-machine-integrationkit.drawio
rename to docs/diagrams-source/camel-k-state-machine-integrationkit.drawio
diff --git a/docs/modules/ROOT/assets/diagrams/operator-control-loop.drawio
b/docs/diagrams-source/operator-control-loop.drawio
similarity index 100%
rename from docs/modules/ROOT/assets/diagrams/operator-control-loop.drawio
rename to docs/diagrams-source/operator-control-loop.drawio
diff --git a/docs/modules/ROOT/assets/diagrams/README.adoc
b/docs/modules/ROOT/assets/diagrams/README.adoc
deleted file mode 100644
index aa50d57..0000000
--- a/docs/modules/ROOT/assets/diagrams/README.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-Diagrams
-========
-
-Files generated by https://app.diagrams.net
diff --git
a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
b/docs/modules/ROOT/attachments/schema/integration-schema.json
similarity index 100%
rename from docs/modules/ROOT/assets/attachments/schema/integration-schema.json
rename to docs/modules/ROOT/attachments/schema/integration-schema.json
diff --git a/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
b/docs/modules/ROOT/attachments/schema/kamelet-schema.json
similarity index 100%
rename from docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
rename to docs/modules/ROOT/attachments/schema/kamelet-schema.json
diff --git
a/docs/modules/ROOT/assets/attachments/tekton/camel-k-pipeline-permissions.yaml
b/docs/modules/ROOT/attachments/tekton/camel-k-pipeline-permissions.yaml
similarity index 100%
rename from
docs/modules/ROOT/assets/attachments/tekton/camel-k-pipeline-permissions.yaml
rename to docs/modules/ROOT/attachments/tekton/camel-k-pipeline-permissions.yaml
diff --git
a/docs/modules/ROOT/assets/attachments/tekton/camel-k-pipeline-task-definition.yaml
b/docs/modules/ROOT/attachments/tekton/camel-k-pipeline-task-definition.yaml
similarity index 100%
rename from
docs/modules/ROOT/assets/attachments/tekton/camel-k-pipeline-task-definition.yaml
rename to
docs/modules/ROOT/attachments/tekton/camel-k-pipeline-task-definition.yaml
diff --git
a/docs/modules/ROOT/assets/attachments/tekton/camel-k-pipeline-task-run.yaml
b/docs/modules/ROOT/attachments/tekton/camel-k-pipeline-task-run.yaml
similarity index 100%
rename from
docs/modules/ROOT/assets/attachments/tekton/camel-k-pipeline-task-run.yaml
rename to docs/modules/ROOT/attachments/tekton/camel-k-pipeline-task-run.yaml
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-high-level.svg
b/docs/modules/ROOT/images/architecture/camel-k-high-level.svg
similarity index 100%
rename from docs/modules/ROOT/assets/images/architecture/camel-k-high-level.svg
rename to docs/modules/ROOT/images/architecture/camel-k-high-level.svg
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-operator-control-loop.png
b/docs/modules/ROOT/images/architecture/camel-k-operator-control-loop.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-operator-control-loop.png
rename to
docs/modules/ROOT/images/architecture/camel-k-operator-control-loop.png
diff --git a/docs/modules/ROOT/assets/images/architecture/camel-k-operator.jpg
b/docs/modules/ROOT/images/architecture/camel-k-operator.jpg
similarity index 100%
rename from docs/modules/ROOT/assets/images/architecture/camel-k-operator.jpg
rename to docs/modules/ROOT/images/architecture/camel-k-operator.jpg
diff --git a/docs/modules/ROOT/assets/images/architecture/camel-k-runtimes.jpg
b/docs/modules/ROOT/images/architecture/camel-k-runtimes.jpg
similarity index 100%
rename from docs/modules/ROOT/assets/images/architecture/camel-k-runtimes.jpg
rename to docs/modules/ROOT/images/architecture/camel-k-runtimes.jpg
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-sources-diagram.png
b/docs/modules/ROOT/images/architecture/camel-k-sources-diagram.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-sources-diagram.png
rename to docs/modules/ROOT/images/architecture/camel-k-sources-diagram.png
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-basic.png
b/docs/modules/ROOT/images/architecture/camel-k-state-machine-basic.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-basic.png
rename to docs/modules/ROOT/images/architecture/camel-k-state-machine-basic.png
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-build.png
b/docs/modules/ROOT/images/architecture/camel-k-state-machine-build.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-build.png
rename to docs/modules/ROOT/images/architecture/camel-k-state-machine-build.png
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-integration-platform.png
b/docs/modules/ROOT/images/architecture/camel-k-state-machine-integration-platform.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-integration-platform.png
rename to
docs/modules/ROOT/images/architecture/camel-k-state-machine-integration-platform.png
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-integration.png
b/docs/modules/ROOT/images/architecture/camel-k-state-machine-integration.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-integration.png
rename to
docs/modules/ROOT/images/architecture/camel-k-state-machine-integration.png
diff --git
a/docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-integrationkit.png
b/docs/modules/ROOT/images/architecture/camel-k-state-machine-integrationkit.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/camel-k-state-machine-integrationkit.png
rename to
docs/modules/ROOT/images/architecture/camel-k-state-machine-integrationkit.png
diff --git a/docs/modules/ROOT/assets/images/architecture/camel-k-traits.jpg
b/docs/modules/ROOT/images/architecture/camel-k-traits.jpg
similarity index 100%
rename from docs/modules/ROOT/assets/images/architecture/camel-k-traits.jpg
rename to docs/modules/ROOT/images/architecture/camel-k-traits.jpg
diff --git a/docs/modules/ROOT/assets/images/architecture/camel-k.jpg
b/docs/modules/ROOT/images/architecture/camel-k.jpg
similarity index 100%
rename from docs/modules/ROOT/assets/images/architecture/camel-k.jpg
rename to docs/modules/ROOT/images/architecture/camel-k.jpg
diff --git
a/docs/modules/ROOT/assets/images/architecture/operator-control-loop.png
b/docs/modules/ROOT/images/architecture/operator-control-loop.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/architecture/operator-control-loop.png
rename to docs/modules/ROOT/images/architecture/operator-control-loop.png
diff --git a/docs/modules/ROOT/assets/images/debugging/remote-debugger.png
b/docs/modules/ROOT/images/debugging/remote-debugger.png
similarity index 100%
rename from docs/modules/ROOT/assets/images/debugging/remote-debugger.png
rename to docs/modules/ROOT/images/debugging/remote-debugger.png
diff --git
a/docs/modules/ROOT/assets/images/tekton/tekton-pipeline-definition.png
b/docs/modules/ROOT/images/tekton/tekton-pipeline-definition.png
similarity index 100%
rename from
docs/modules/ROOT/assets/images/tekton/tekton-pipeline-definition.png
rename to docs/modules/ROOT/images/tekton/tekton-pipeline-definition.png
diff --git a/docs/modules/ROOT/assets/images/tekton/tekton-pipeline-result.png
b/docs/modules/ROOT/images/tekton/tekton-pipeline-result.png
similarity index 100%
rename from docs/modules/ROOT/assets/images/tekton/tekton-pipeline-result.png
rename to docs/modules/ROOT/images/tekton/tekton-pipeline-result.png
diff --git a/docs/modules/ROOT/assets/images/tekton/tekton-pipeline-run.png
b/docs/modules/ROOT/images/tekton/tekton-pipeline-run.png
similarity index 100%
rename from docs/modules/ROOT/assets/images/tekton/tekton-pipeline-run.png
rename to docs/modules/ROOT/images/tekton/tekton-pipeline-run.png
diff --git a/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc
b/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc
index db083a2..fdf8a69 100644
--- a/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc
+++ b/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc
@@ -88,7 +88,7 @@ oc new-project camel-pipelines
Any running container that needs to interact with the Kubernetes API (in our
case, to create deployment and integration resources) must
have special permissions granted to its service account.
-Download the
link:{attachmentsdir}/tekton/camel-k-pipeline-permissions.yaml[camel-k-pipeline-permissions.yaml]
file and save it into a directory in your hard drive.
+Download the
xref:attachment$tekton/camel-k-pipeline-permissions.yaml[camel-k-pipeline-permissions.yaml]
file and save it into a directory in your hard drive.
Then install it using the `oc` client tool:
[source,bash]
@@ -101,7 +101,7 @@ that is authorized to create the same kind of resources
that the Camel K operato
=== Creating the Pipeline Definition
-Let's now create the pipeline definition. Download the
link:{attachmentsdir}/tekton/camel-k-pipeline-task-definition.yaml[camel-k-pipeline-task-definition.yaml]
file
+Let's now create the pipeline definition. Download the
xref:attachment$tekton/camel-k-pipeline-task-definition.yaml[camel-k-pipeline-task-definition.yaml]
file
and apply it to the cluster:
[source,bash]
@@ -191,7 +191,7 @@ The repo will be now used as input for the
<<camel-k-task-run-integration,run-in
=== Triggering a Pipeline Execution
-Everything is now ready to be executed and the last thing missing is a
trigger. Download the
link:{attachmentsdir}/tekton/camel-k-pipeline-task-run.yaml[camel-k-pipeline-task-run.yaml]
file
+Everything is now ready to be executed and the last thing missing is a
trigger. Download the
xref:attachment$tekton/camel-k-pipeline-task-run.yaml[camel-k-pipeline-task-run.yaml]
file
and apply it to the cluster:
[source,bash]
