From e9d192dbdafba2c46341834bf9d96c41b5ca0b23 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 11:52:03 +0100 Subject: [PATCH 01/34] Added trino in distributed --- antora-playbook.yml | 1 + antora.yml | 1 + local-antora-playbook.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 31ee9499c..0db7c5a73 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -52,6 +52,7 @@ content: start_path: docs - url: https://github.com/stackabletech/trino-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs diff --git a/antora.yml b/antora.yml index 8ecace773..66f6676b0 100644 --- a/antora.yml +++ b/antora.yml @@ -9,4 +9,5 @@ nav: - modules/operators/nav.adoc - modules/contributor/nav.adoc - modules/ROOT/nav2.adoc + - modules/trino/nav.adoc prerelease: true diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index 83aa9a9ad..da0e06eea 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -52,6 +52,7 @@ content: start_path: docs - url: https://github.com/stackabletech/trino-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs From 4f6d221e0277a8973165a7bfd680aca73c706b20 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:01:03 +0100 Subject: [PATCH 02/34] fix branch reference --- antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 0db7c5a73..c116007bc 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -18,7 +18,7 @@ content: sources: - url: https://github.com/stackabletech/documentation.git tags: [] - branches: [main, release/*] + branches: [release-*, spike/distributed-component] # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs From f5cc2932b072c3cca54536d15792793c97322cfd Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:25:55 +0100 Subject: [PATCH 03/34] referenced new ZK branch --- antora-playbook.yml | 1 + antora.yml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index c116007bc..638800f4d 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -55,6 +55,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs + branches: [release-*, spike/distributed-component] ui: bundle: diff --git a/antora.yml b/antora.yml index 66f6676b0..d275894ba 100644 --- a/antora.yml +++ b/antora.yml @@ -7,7 +7,10 @@ nav: - modules/tutorials/nav.adoc - modules/reference/nav.adoc - modules/operators/nav.adoc + # operators + - modules/trino/nav.adoc + - modules/zookeeper/nav.adoc + # ... - modules/contributor/nav.adoc - modules/ROOT/nav2.adoc - - modules/trino/nav.adoc prerelease: true From 3f81ca75ff75ee2624ed87e1b31040f302c0bcf4 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:34:42 +0100 Subject: [PATCH 04/34] fixed release branche reference glob --- antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 638800f4d..39f22ef09 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -18,7 +18,7 @@ content: sources: - url: https://github.com/stackabletech/documentation.git tags: [] - branches: [release-*, spike/distributed-component] + branches: [release/*, spike/distributed-component] # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs From de9c8516ec52bf2a566efbb8fe93335b5aa2312b Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:46:32 +0100 Subject: [PATCH 05/34] netlify redirects --- antora-playbook.yml | 1 + netlify.toml | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 netlify.toml diff --git a/antora-playbook.yml b/antora-playbook.yml index 39f22ef09..a39dc004a 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -11,6 +11,7 @@ urls: # This replaces the component version in the URL of the latest stable version with 'stable' # i.e. /commons-operator/stable/index.html instead of /commons-operator/0.3/index.html latest_version_segment: stable + redirect_facility: netlify content: branches: [release-*, main] diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 000000000..fbad65858 --- /dev/null +++ b/netlify.toml @@ -0,0 +1,3 @@ +[[redirects]] + from = "/zookeeper/nightly" + to = "/home/nightly/zookeeper" From 56d165e12764f282e5440a93b9af7ea165bed703 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:50:41 +0100 Subject: [PATCH 06/34] removed main branch --- antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index a39dc004a..e8f78cbc8 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -14,7 +14,7 @@ urls: redirect_facility: netlify content: - branches: [release-*, main] + branches: [release-*] tags: docs/* sources: - url: https://github.com/stackabletech/documentation.git From 2842c27e5837b642bf996288ba0e8e35bca350bc Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:54:49 +0100 Subject: [PATCH 07/34] updated netlify redirect for zookeeper --- netlify.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index fbad65858..b919cad84 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [[redirects]] - from = "/zookeeper/nightly" - to = "/home/nightly/zookeeper" + from = "/zookeeper/nightly/*" + to = "/home/nightly/zookeeper/:splat" From ebc2337673a0a8c36b2e8d8e1a4a5ec9e56baf2b Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 12:58:13 +0100 Subject: [PATCH 08/34] generic redirect --- netlify.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index b919cad84..be0b625fa 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,4 @@ [[redirects]] - from = "/zookeeper/nightly/*" - to = "/home/nightly/zookeeper/:splat" + from = "/:operator/nightly/*" + to = "/home/nightly/:operator/:splat" + From b9f2dc1f21cfe62b5eb8dc74c60697179e162d0c Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 13:21:39 +0100 Subject: [PATCH 09/34] added airflow --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index e8f78cbc8..bf1efe116 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -33,6 +33,7 @@ content: # product operators - url: https://github.com/stackabletech/airflow-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/druid-operator.git start_path: docs - url: https://github.com/stackabletech/hbase-operator.git diff --git a/antora.yml b/antora.yml index d275894ba..92a8efb94 100644 --- a/antora.yml +++ b/antora.yml @@ -8,6 +8,7 @@ nav: - modules/reference/nav.adoc - modules/operators/nav.adoc # operators + - modules/airflow/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From 15f06eead1f685f78a4678ff1374d4ff4dd5b395 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 16:05:26 +0100 Subject: [PATCH 10/34] Added hbase --- antora-playbook.yml | 2 ++ antora.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index bf1efe116..837a1f2f6 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -36,8 +36,10 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/druid-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/hbase-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs - url: https://github.com/stackabletech/hive-operator.git diff --git a/antora.yml b/antora.yml index 92a8efb94..3ce77f15c 100644 --- a/antora.yml +++ b/antora.yml @@ -9,6 +9,8 @@ nav: - modules/operators/nav.adoc # operators - modules/airflow/nav.adoc + - modules/druid/nav.adoc + - modules/hbase/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From a86757bced4c957e9af2bca85ce7eac121e9ed5c Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 6 Feb 2023 16:14:18 +0100 Subject: [PATCH 11/34] Added HDFS --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 837a1f2f6..9dac9e861 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -42,6 +42,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/hive-operator.git start_path: docs - url: https://github.com/stackabletech/kafka-operator.git diff --git a/antora.yml b/antora.yml index 3ce77f15c..a199f195d 100644 --- a/antora.yml +++ b/antora.yml @@ -11,6 +11,7 @@ nav: - modules/airflow/nav.adoc - modules/druid/nav.adoc - modules/hbase/nav.adoc + - modules/hdfs/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From e54f3582bfe7194613c002820522fbad42726a94 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 10:25:15 +0100 Subject: [PATCH 12/34] Added Hive --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 9dac9e861..fbd64507b 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -45,6 +45,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/hive-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/kafka-operator.git start_path: docs - url: https://github.com/stackabletech/nifi-operator.git diff --git a/antora.yml b/antora.yml index a199f195d..78a85279e 100644 --- a/antora.yml +++ b/antora.yml @@ -12,6 +12,7 @@ nav: - modules/druid/nav.adoc - modules/hbase/nav.adoc - modules/hdfs/nav.adoc + - modules/hive/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From e331957c4f4981917d0d3584c2d2dc9c7554a872 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 10:32:30 +0100 Subject: [PATCH 13/34] Added Kafka --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index fbd64507b..fdcbf4b9b 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -48,6 +48,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/kafka-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/nifi-operator.git start_path: docs - url: https://github.com/stackabletech/opa-operator.git diff --git a/antora.yml b/antora.yml index 78a85279e..99eca0332 100644 --- a/antora.yml +++ b/antora.yml @@ -13,6 +13,7 @@ nav: - modules/hbase/nav.adoc - modules/hdfs/nav.adoc - modules/hive/nav.adoc + - modules/kafka/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From b7d87c0abe0df306ab8399f3a0ec0611e380dec5 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 10:49:44 +0100 Subject: [PATCH 14/34] Added NiFi --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index fdcbf4b9b..1634663d9 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -51,6 +51,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/nifi-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/opa-operator.git start_path: docs - url: https://github.com/stackabletech/spark-k8s-operator.git diff --git a/antora.yml b/antora.yml index 99eca0332..f2b04efc3 100644 --- a/antora.yml +++ b/antora.yml @@ -14,6 +14,7 @@ nav: - modules/hdfs/nav.adoc - modules/hive/nav.adoc - modules/kafka/nav.adoc + - modules/nifi/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From 214ec08b78c426ee110542175a4be9e98ed2b297 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 11:14:20 +0100 Subject: [PATCH 15/34] Added OPA --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 1634663d9..6121103c1 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -54,6 +54,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/opa-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs - url: https://github.com/stackabletech/superset-operator.git diff --git a/antora.yml b/antora.yml index f2b04efc3..f9b2c28e4 100644 --- a/antora.yml +++ b/antora.yml @@ -15,6 +15,7 @@ nav: - modules/hive/nav.adoc - modules/kafka/nav.adoc - modules/nifi/nav.adoc + - modules/opa/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From 373b8bfeb2a39cdd065aa38ef624436b916783f8 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 11:31:10 +0100 Subject: [PATCH 16/34] Added Spark --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 6121103c1..71233b11c 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -57,6 +57,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/superset-operator.git start_path: docs - url: https://github.com/stackabletech/trino-operator.git diff --git a/antora.yml b/antora.yml index f9b2c28e4..737630475 100644 --- a/antora.yml +++ b/antora.yml @@ -16,6 +16,7 @@ nav: - modules/kafka/nav.adoc - modules/nifi/nav.adoc - modules/opa/nav.adoc + - modules/spark-k8s/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From d9751f7bf5a986d5cd60c7ade728df2e6e529526 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 11:46:42 +0100 Subject: [PATCH 17/34] Added Superset --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 71233b11c..b00f51934 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -60,6 +60,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/superset-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/trino-operator.git start_path: docs branches: [release-*, spike/distributed-component] diff --git a/antora.yml b/antora.yml index 737630475..a00b09291 100644 --- a/antora.yml +++ b/antora.yml @@ -17,6 +17,7 @@ nav: - modules/nifi/nav.adoc - modules/opa/nav.adoc - modules/spark-k8s/nav.adoc + - modules/superset/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc # ... From a5a5e89471a1f0afc95dbbedc6686df20ea86adb Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 11:52:54 +0100 Subject: [PATCH 18/34] Added commons --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index b00f51934..138ee77ee 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -26,6 +26,7 @@ content: # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/secret-operator.git start_path: docs - url: https://github.com/stackabletech/listener-operator.git diff --git a/antora.yml b/antora.yml index a00b09291..1fae905ce 100644 --- a/antora.yml +++ b/antora.yml @@ -20,6 +20,7 @@ nav: - modules/superset/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc + - modules/commons-operator/nav.adoc # ... - modules/contributor/nav.adoc - modules/ROOT/nav2.adoc From dad4efe72d4cbdd808d85b7102d2f4abc439b2d4 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 11:59:29 +0100 Subject: [PATCH 19/34] Added secret operator --- antora-playbook.yml | 1 + antora.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 138ee77ee..36dd65956 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -29,6 +29,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/secret-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/listener-operator.git start_path: docs # product operators diff --git a/antora.yml b/antora.yml index 1fae905ce..5ac91e558 100644 --- a/antora.yml +++ b/antora.yml @@ -20,7 +20,9 @@ nav: - modules/superset/nav.adoc - modules/trino/nav.adoc - modules/zookeeper/nav.adoc + # stackable operators - modules/commons-operator/nav.adoc + - modules/secret-operator/nav.adoc # ... - modules/contributor/nav.adoc - modules/ROOT/nav2.adoc From 74dc7ed2c72f09daa3332b34ac91ac7ef1b78f14 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 12:02:41 +0100 Subject: [PATCH 20/34] Added listener operator --- antora-playbook.yml | 1 + antora.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 36dd65956..821c58fdd 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -32,6 +32,7 @@ content: branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/listener-operator.git start_path: docs + branches: [release-*, spike/distributed-component] # product operators - url: https://github.com/stackabletech/airflow-operator.git start_path: docs diff --git a/antora.yml b/antora.yml index 5ac91e558..0f7c53b97 100644 --- a/antora.yml +++ b/antora.yml @@ -23,6 +23,7 @@ nav: # stackable operators - modules/commons-operator/nav.adoc - modules/secret-operator/nav.adoc + - modules/listener-operator/nav.adoc # ... - modules/contributor/nav.adoc - modules/ROOT/nav2.adoc From 5640f4f47e0d528641857b0496c475e50580ea15 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 12:35:56 +0100 Subject: [PATCH 21/34] Moved secret nav --- modules/operators/nav.adoc | 2 +- modules/operators/partials/operator_doc_links.adoc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/operators/nav.adoc b/modules/operators/nav.adoc index 9e5c50b99..2a90832c8 100644 --- a/modules/operators/nav.adoc +++ b/modules/operators/nav.adoc @@ -1,4 +1,4 @@ * xref:index.adoc[] ** xref:supported_versions.adoc[] ** xref:monitoring.adoc[] -include::partial$operator_doc_links.adoc[] \ No newline at end of file +include::partial$operator_doc_links.adoc[] diff --git a/modules/operators/partials/operator_doc_links.adoc b/modules/operators/partials/operator_doc_links.adoc index 6c40749ce..e91c7befb 100644 --- a/modules/operators/partials/operator_doc_links.adoc +++ b/modules/operators/partials/operator_doc_links.adoc @@ -11,4 +11,8 @@ ** xref:zookeeper::index.adoc[Apache ZooKeeper] ** xref:opa::index.adoc[OpenPolicyAgent] ** xref:commons-operator::index.adoc[Commons] -** xref:secret-operator::index.adoc[Secret] +** xref:secret-operator:index.adoc[Secret] ++ +-- +include::secret-operator:partial$nav.adoc[] +-- \ No newline at end of file From 959329f49b08270046d1045645bfaef8e8068bee Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 7 Feb 2023 14:19:54 +0100 Subject: [PATCH 22/34] changed navigation --- antora.yml | 18 ---- .../partials/operator_doc_links.adoc | 84 ++++++++++++++++--- 2 files changed, 71 insertions(+), 31 deletions(-) diff --git a/antora.yml b/antora.yml index 0f7c53b97..8ecace773 100644 --- a/antora.yml +++ b/antora.yml @@ -7,24 +7,6 @@ nav: - modules/tutorials/nav.adoc - modules/reference/nav.adoc - modules/operators/nav.adoc - # operators - - modules/airflow/nav.adoc - - modules/druid/nav.adoc - - modules/hbase/nav.adoc - - modules/hdfs/nav.adoc - - modules/hive/nav.adoc - - modules/kafka/nav.adoc - - modules/nifi/nav.adoc - - modules/opa/nav.adoc - - modules/spark-k8s/nav.adoc - - modules/superset/nav.adoc - - modules/trino/nav.adoc - - modules/zookeeper/nav.adoc - # stackable operators - - modules/commons-operator/nav.adoc - - modules/secret-operator/nav.adoc - - modules/listener-operator/nav.adoc - # ... - modules/contributor/nav.adoc - modules/ROOT/nav2.adoc prerelease: true diff --git a/modules/operators/partials/operator_doc_links.adoc b/modules/operators/partials/operator_doc_links.adoc index e91c7befb..c6a77712e 100644 --- a/modules/operators/partials/operator_doc_links.adoc +++ b/modules/operators/partials/operator_doc_links.adoc @@ -1,16 +1,74 @@ -** xref:airflow::index.adoc[Apache Airflow] -** xref:druid::index.adoc[Apache Druid] -** xref:hbase::index.adoc[Apache HBase] -** xref:hdfs::index.adoc[Apache Hadoop HDFS] -** xref:hive::index.adoc[Apache Hive] -** xref:kafka::index.adoc[Apache Kafka] -** xref:nifi::index.adoc[Apache NiFi] -** xref:spark-k8s::index.adoc[Apache Spark on K8S] -** xref:superset::index.adoc[Apache Superset] -** xref:trino::index.adoc[Trino] -** xref:zookeeper::index.adoc[Apache ZooKeeper] -** xref:opa::index.adoc[OpenPolicyAgent] -** xref:commons-operator::index.adoc[Commons] +// docs for the syntax below: https://docs.antora.org/antora/latest/navigation/include-lists/#include-a-nested-list +** xref:airflow:index.adoc[Apache Airflow] ++ +-- +include::airflow:partial$nav.adoc[] +-- +** xref:druid:index.adoc[Apache Druid] ++ +-- +include::druid:partial$nav.adoc[] +-- +** xref:hbase:index.adoc[Apache HBase] ++ +-- +include::hbase:partial$nav.adoc[] +-- +** xref:hdfs:index.adoc[Apache Hadoop HDFS] ++ +-- +include::hdfs:partial$nav.adoc[] +-- +** xref:hive:index.adoc[Apache Hive] ++ +-- +include::hive:partial$nav.adoc[] +-- +** xref:kafka:index.adoc[Apache Kafka] ++ +-- +include::kafka:partial$nav.adoc[] +-- +** xref:nifi:index.adoc[Apache NiFi] ++ +-- +include::nifi:partial$nav.adoc[] +-- +** xref:spark-k8s:index.adoc[Apache Spark on K8S] ++ +-- +include::spark-k8s:partial$nav.adoc[] +-- +** xref:superset:index.adoc[Apache Superset] ++ +-- +include::superset:partial$nav.adoc[] +-- +** xref:trino:index.adoc[Trino] ++ +-- +include::trino:partial$nav.adoc[] +-- +** xref:zookeeper:index.adoc[Apache ZooKeeper] ++ +-- +include::zookeeper:partial$nav.adoc[] +-- +** xref:opa:index.adoc[OpenPolicyAgent] ++ +-- +include::opa:partial$nav.adoc[] +-- +** xref:commons-operator:index.adoc[Commons] ++ +-- +include::commons-operator:partial$nav.adoc[] +-- +** xref:listener-operator:index.adoc[Listener] ++ +-- +include::listener-operator:partial$nav.adoc[] +-- ** xref:secret-operator:index.adoc[Secret] + -- From 077f3975f1e73e8e3c2596ef9635bb73ad6eb0e4 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Thu, 9 Feb 2023 09:58:27 +0100 Subject: [PATCH 23/34] fix: excluded stackablectl from the redirects --- netlify.toml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index be0b625fa..cc4e0186c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,4 +1,74 @@ [[redirects]] - from = "/:operator/nightly/*" - to = "/home/nightly/:operator/:splat" + from = "/airflow/nightly/*" + to = "/home/nightly/airflow/:splat" + status = 302 +[[redirects]] + from = "/druid/nightly/*" + to = "/home/nightly/druid/:splat" + status = 302 + +[[redirects]] + from = "/hbase/nightly/*" + to = "/home/nightly/hbase/:splat" + status = 302 + +[[redirects]] + from = "/hdfs/nightly/*" + to = "/home/nightly/hdfs/:splat" + status = 302 + +[[redirects]] + from = "/hive/nightly/*" + to = "/home/nightly/hive/:splat" + status = 302 + +[[redirects]] + from = "/kafka/nightly/*" + to = "/home/nightly/kafka/:splat" + status = 302 + +[[redirects]] + from = "/nifi/nightly/*" + to = "/home/nightly/nifi/:splat" + status = 302 + +[[redirects]] + from = "/spark-k8s/nightly/*" + to = "/home/nightly/spark-k8s/:splat" + status = 302 + +[[redirects]] + from = "/superset/nightly/*" + to = "/home/nightly/superset/:splat" + status = 302 + +[[redirects]] + from = "/trino/nightly/*" + to = "/home/nightly/trino/:splat" + status = 302 + +[[redirects]] + from = "/zookeeper/nightly/*" + to = "/home/nightly/zookeeper/:splat" + status = 302 + +[[redirects]] + from = "/opa/nightly/*" + to = "/home/nightly/opa/:splat" + status = 302 + +[[redirects]] + from = "/commons-operator/nightly/*" + to = "/home/nightly/commons-operator/:splat" + status = 302 + +[[redirects]] + from = "/secret-operator/nightly/*" + to = "/home/nightly/secret-operator/:splat" + status = 302 + +[[redirects]] + from = "/listener-operator/nightly/*" + to = "/home/nightly/listener-operator/:splat" + status = 302 From 2bac18b1d75128dadc4ddc92c2e54c59eed03a19 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Thu, 9 Feb 2023 12:03:16 +0100 Subject: [PATCH 24/34] fix: change branch pull back to main for stackablectl --- antora-playbook.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 821c58fdd..d6f156e80 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -23,6 +23,7 @@ content: # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs + branches: main # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs From b0292d368f81be34906999565c70e5e3b02ab89a Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 10:03:29 +0100 Subject: [PATCH 25/34] OPA only --- antora-playbook.yml | 28 +++---- local-antora-playbook.yml | 17 +++- .../partials/operator_doc_links.adoc | 84 ++++--------------- netlify.toml | 70 ---------------- 4 files changed, 44 insertions(+), 155 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index d6f156e80..bda127214 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -27,50 +27,50 @@ content: # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/secret-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/listener-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] # product operators - url: https://github.com/stackabletech/airflow-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/druid-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/hbase-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/hive-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/kafka-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/nifi-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/opa-operator.git start_path: docs branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/superset-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/trino-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] ui: bundle: diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index da0e06eea..0baae375d 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -22,39 +22,54 @@ content: # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs + branches: main # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/secret-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/listener-operator.git start_path: docs + branches: [release-*, main] # product operators - url: https://github.com/stackabletech/airflow-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/druid-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/hbase-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/hive-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/kafka-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/nifi-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/opa-operator.git start_path: docs + branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/superset-operator.git start_path: docs + branches: [release-*, main] - url: https://github.com/stackabletech/trino-operator.git start_path: docs - branches: [release-*, spike/distributed-component] + branches: [release-*, main] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs + branches: [release-*, main] ui: bundle: diff --git a/modules/operators/partials/operator_doc_links.adoc b/modules/operators/partials/operator_doc_links.adoc index c6a77712e..7d4e62e7b 100644 --- a/modules/operators/partials/operator_doc_links.adoc +++ b/modules/operators/partials/operator_doc_links.adoc @@ -1,76 +1,20 @@ // docs for the syntax below: https://docs.antora.org/antora/latest/navigation/include-lists/#include-a-nested-list -** xref:airflow:index.adoc[Apache Airflow] -+ --- -include::airflow:partial$nav.adoc[] --- -** xref:druid:index.adoc[Apache Druid] -+ --- -include::druid:partial$nav.adoc[] --- -** xref:hbase:index.adoc[Apache HBase] -+ --- -include::hbase:partial$nav.adoc[] --- -** xref:hdfs:index.adoc[Apache Hadoop HDFS] -+ --- -include::hdfs:partial$nav.adoc[] --- -** xref:hive:index.adoc[Apache Hive] -+ --- -include::hive:partial$nav.adoc[] --- -** xref:kafka:index.adoc[Apache Kafka] -+ --- -include::kafka:partial$nav.adoc[] --- -** xref:nifi:index.adoc[Apache NiFi] -+ --- -include::nifi:partial$nav.adoc[] --- -** xref:spark-k8s:index.adoc[Apache Spark on K8S] -+ --- -include::spark-k8s:partial$nav.adoc[] --- -** xref:superset:index.adoc[Apache Superset] -+ --- -include::superset:partial$nav.adoc[] --- -** xref:trino:index.adoc[Trino] -+ --- -include::trino:partial$nav.adoc[] --- -** xref:zookeeper:index.adoc[Apache ZooKeeper] -+ --- -include::zookeeper:partial$nav.adoc[] --- +** xref:airflow::index.adoc[Apache Airflow] +** xref:druid::index.adoc[Apache Druid] +** xref:hbase::index.adoc[Apache HBase] +** xref:hdfs::index.adoc[Apache Hadoop HDFS] +** xref:hive::index.adoc[Apache Hive] +** xref:kafka::index.adoc[Apache Kafka] +** xref:nifi::index.adoc[Apache NiFi] +** xref:spark-k8s::index.adoc[Apache Spark on K8S] +** xref:superset::index.adoc[Apache Superset] +** xref:trino::index.adoc[Trino] +** xref:zookeeper::index.adoc[Apache ZooKeeper] ** xref:opa:index.adoc[OpenPolicyAgent] + -- include::opa:partial$nav.adoc[] -- -** xref:commons-operator:index.adoc[Commons] -+ --- -include::commons-operator:partial$nav.adoc[] --- -** xref:listener-operator:index.adoc[Listener] -+ --- -include::listener-operator:partial$nav.adoc[] --- -** xref:secret-operator:index.adoc[Secret] -+ --- -include::secret-operator:partial$nav.adoc[] --- \ No newline at end of file +** xref:commons-operator::index.adoc[Commons] +** xref:listener-operator::index.adoc[Listener] +** xref:secret-operator::index.adoc[Secret] diff --git a/netlify.toml b/netlify.toml index cc4e0186c..2df4b21c4 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,74 +1,4 @@ -[[redirects]] - from = "/airflow/nightly/*" - to = "/home/nightly/airflow/:splat" - status = 302 - -[[redirects]] - from = "/druid/nightly/*" - to = "/home/nightly/druid/:splat" - status = 302 - -[[redirects]] - from = "/hbase/nightly/*" - to = "/home/nightly/hbase/:splat" - status = 302 - -[[redirects]] - from = "/hdfs/nightly/*" - to = "/home/nightly/hdfs/:splat" - status = 302 - -[[redirects]] - from = "/hive/nightly/*" - to = "/home/nightly/hive/:splat" - status = 302 - -[[redirects]] - from = "/kafka/nightly/*" - to = "/home/nightly/kafka/:splat" - status = 302 - -[[redirects]] - from = "/nifi/nightly/*" - to = "/home/nightly/nifi/:splat" - status = 302 - -[[redirects]] - from = "/spark-k8s/nightly/*" - to = "/home/nightly/spark-k8s/:splat" - status = 302 - -[[redirects]] - from = "/superset/nightly/*" - to = "/home/nightly/superset/:splat" - status = 302 - -[[redirects]] - from = "/trino/nightly/*" - to = "/home/nightly/trino/:splat" - status = 302 - -[[redirects]] - from = "/zookeeper/nightly/*" - to = "/home/nightly/zookeeper/:splat" - status = 302 - [[redirects]] from = "/opa/nightly/*" to = "/home/nightly/opa/:splat" status = 302 - -[[redirects]] - from = "/commons-operator/nightly/*" - to = "/home/nightly/commons-operator/:splat" - status = 302 - -[[redirects]] - from = "/secret-operator/nightly/*" - to = "/home/nightly/secret-operator/:splat" - status = 302 - -[[redirects]] - from = "/listener-operator/nightly/*" - to = "/home/nightly/listener-operator/:splat" - status = 302 From bc019e7515f0fb7f88e64665972b8066f1d43602 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 10:07:46 +0100 Subject: [PATCH 26/34] fix playbook --- antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index bda127214..51d345669 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -19,7 +19,7 @@ content: sources: - url: https://github.com/stackabletech/documentation.git tags: [] - branches: [release/*, spike/distributed-component] + branches: [release/*, spike/distributed-component-opa] # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs From 68b6bb7624b42f07c8edd705e7a5511dbd6352dd Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:02:55 +0100 Subject: [PATCH 27/34] Update operator_doc_links.adoc --- modules/operators/partials/operator_doc_links.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/operators/partials/operator_doc_links.adoc b/modules/operators/partials/operator_doc_links.adoc index 7d4e62e7b..92ef0a2b0 100644 --- a/modules/operators/partials/operator_doc_links.adoc +++ b/modules/operators/partials/operator_doc_links.adoc @@ -10,7 +10,7 @@ ** xref:superset::index.adoc[Apache Superset] ** xref:trino::index.adoc[Trino] ** xref:zookeeper::index.adoc[Apache ZooKeeper] -** xref:opa:index.adoc[OpenPolicyAgent] +** xref:opa:index.adoc[Open Policy Agent] + -- include::opa:partial$nav.adoc[] From c511400b12c1123fca5d3b755d565b31ef42fcbb Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 11:37:03 +0100 Subject: [PATCH 28/34] branches & redirects --- antora-playbook.yml | 17 +---------------- local-antora-playbook.yml | 15 --------------- netlify.toml | 5 +++++ 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 51d345669..0c9c01f79 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -14,12 +14,11 @@ urls: redirect_facility: netlify content: - branches: [release-*] + branches: [release-*, main] tags: docs/* sources: - url: https://github.com/stackabletech/documentation.git tags: [] - branches: [release/*, spike/distributed-component-opa] # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs @@ -27,50 +26,36 @@ content: # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/secret-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/listener-operator.git start_path: docs - branches: [release-*, main] # product operators - url: https://github.com/stackabletech/airflow-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/druid-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/hbase-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs branches: [release-*, main] - url: https://github.com/stackabletech/hive-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/kafka-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/nifi-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/opa-operator.git start_path: docs - branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/superset-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/trino-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs - branches: [release-*, main] ui: bundle: diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index 0baae375d..fae329830 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -26,50 +26,35 @@ content: # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/secret-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/listener-operator.git start_path: docs - branches: [release-*, main] # product operators - url: https://github.com/stackabletech/airflow-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/druid-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/hbase-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/hive-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/kafka-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/nifi-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/opa-operator.git start_path: docs - branches: [release-*, spike/distributed-component] - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/superset-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/trino-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/zookeeper-operator.git start_path: docs - branches: [release-*, main] ui: bundle: diff --git a/netlify.toml b/netlify.toml index 2df4b21c4..cc5f2c77b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -2,3 +2,8 @@ from = "/opa/nightly/*" to = "/home/nightly/opa/:splat" status = 302 + +[[redirects]] + from = "/opa/stable/*" + to = "/home/stable/opa/:splat" + status = 302 From 7af3a5339d0132aa9852813256ef53fd067d21fd Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 12:21:21 +0100 Subject: [PATCH 29/34] Added OPA compat branch --- antora-playbook.yml | 2 +- local-antora-playbook.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 0c9c01f79..ce63555bb 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -14,7 +14,7 @@ urls: redirect_facility: netlify content: - branches: [release-*, main] + branches: [release-*, main, distributed-component-compat] tags: docs/* sources: - url: https://github.com/stackabletech/documentation.git diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index fae329830..0478eaa52 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -13,7 +13,7 @@ urls: latest_version_segment: stable content: - branches: [release-*, main] + branches: [release-*, main, distributed-component-compat] tags: docs/* sources: - url: ./ @@ -45,7 +45,7 @@ content: start_path: docs - url: https://github.com/stackabletech/nifi-operator.git start_path: docs - - url: https://github.com/stackabletech/opa-operator.git + - url: ../opa-operator start_path: docs - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs From 90cab71176efc0e0bb303a4ac8fb2760b95f9c48 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 12:23:51 +0100 Subject: [PATCH 30/34] ~ --- local-antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index 0478eaa52..490f6eb4b 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -45,7 +45,7 @@ content: start_path: docs - url: https://github.com/stackabletech/nifi-operator.git start_path: docs - - url: ../opa-operator + - url: https://github.com/stackabletech/opa-operator.git start_path: docs - url: https://github.com/stackabletech/spark-k8s-operator.git start_path: docs From 564a1f23b45011b30b72315a332ceab8c31e4742 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 12:28:37 +0100 Subject: [PATCH 31/34] branch fix --- antora-playbook.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index ce63555bb..c6440ddc0 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -19,6 +19,7 @@ content: sources: - url: https://github.com/stackabletech/documentation.git tags: [] + branches: [release/*, main] # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs From ea7be8ce87f13538cb1d0a7d00eeb18c717ad676 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 12:34:31 +0100 Subject: [PATCH 32/34] force stable redirct --- netlify.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/netlify.toml b/netlify.toml index cc5f2c77b..b6e1323fb 100644 --- a/netlify.toml +++ b/netlify.toml @@ -7,3 +7,4 @@ from = "/opa/stable/*" to = "/home/stable/opa/:splat" status = 302 + force = true From 75dcacec7909080927cb0977a4fb0e0614a8a32a Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 12:47:12 +0100 Subject: [PATCH 33/34] cleanup --- antora-playbook.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index c6440ddc0..c6ea7614e 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -19,7 +19,7 @@ content: sources: - url: https://github.com/stackabletech/documentation.git tags: [] - branches: [release/*, main] + branches: [main, release/*] # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs @@ -40,7 +40,6 @@ content: start_path: docs - url: https://github.com/stackabletech/hdfs-operator.git start_path: docs - branches: [release-*, main] - url: https://github.com/stackabletech/hive-operator.git start_path: docs - url: https://github.com/stackabletech/kafka-operator.git From a7758c73c72fb863b6fbe88c52a677faeabc985f Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 13 Feb 2023 12:50:41 +0100 Subject: [PATCH 34/34] cleanup --- antora-playbook.yml | 1 - local-antora-playbook.yml | 1 - netlify.toml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index c6ea7614e..96950a162 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -23,7 +23,6 @@ content: # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs - branches: main # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index 490f6eb4b..231c791de 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -22,7 +22,6 @@ content: # stackablectl - url: https://github.com/stackabletech/stackablectl.git start_path: docs - branches: main # internal operators - url: https://github.com/stackabletech/commons-operator.git start_path: docs diff --git a/netlify.toml b/netlify.toml index b6e1323fb..cd9ea1127 100644 --- a/netlify.toml +++ b/netlify.toml @@ -7,4 +7,4 @@ from = "/opa/stable/*" to = "/home/stable/opa/:splat" status = 302 - force = true + force = true # We're generating a compat page, but redirect it