From 047a3c08580ebc079188fac29cc759307d0a4a96 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 30 Jul 2024 17:40:25 +0200 Subject: [PATCH 1/6] Add release branches to the playbooks for release 24.7. --- antora-playbook.yml | 17 +++++++++++++++++ local-antora-playbook.yml | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index 9f630359d..10554f9c4 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -26,6 +26,7 @@ content: - url: . branches: - HEAD + - release/24.7 - release/24.3 - release/23.11 - release/23.7 @@ -40,6 +41,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -50,6 +52,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -59,6 +62,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -68,6 +72,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -78,6 +83,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -87,6 +93,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -96,6 +103,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -105,6 +113,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -114,6 +123,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -123,6 +133,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -132,6 +143,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -141,6 +153,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -150,6 +163,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -159,6 +173,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -168,6 +183,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -177,6 +193,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 diff --git a/local-antora-playbook.yml b/local-antora-playbook.yml index 0799ba8d1..2b3668278 100644 --- a/local-antora-playbook.yml +++ b/local-antora-playbook.yml @@ -15,6 +15,7 @@ content: - url: ./ branches: - HEAD + - release/24.7 - release/24.3 - release/23.11 - release/23.7 @@ -29,6 +30,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -39,6 +41,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -48,6 +51,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -57,6 +61,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -67,6 +72,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -76,6 +82,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -85,6 +92,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -94,6 +102,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -103,6 +112,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -112,6 +122,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -121,6 +132,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -130,6 +142,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -139,6 +152,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -148,6 +162,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -157,6 +172,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 @@ -166,6 +182,7 @@ content: start_path: docs branches: - main + - release-24.7 - release-24.3 - release-23.11 - release-23.7 From 1f3534589b0cc5b40063d6fd6fe449eda0f646d1 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 30 Jul 2024 17:41:43 +0200 Subject: [PATCH 2/6] chore: make generated commits use conventional commit messages --- scripts/publish-new-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish-new-version.sh b/scripts/publish-new-version.sh index 6b5c2b0ad..34d37126c 100755 --- a/scripts/publish-new-version.sh +++ b/scripts/publish-new-version.sh @@ -145,7 +145,7 @@ publish_branch="publish-$docs_version" git checkout -b "$publish_branch" git add . -git commit -m "Add release branches to the playbooks for release $docs_version." +git commit -m "chore: Add release branches to the playbooks for release $docs_version." # Push the branch if requested if [ "$push" = true ]; then From d5712fd0898acba92f7b9a82c6a633fe99a0abe7 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 30 Jul 2024 17:42:33 +0200 Subject: [PATCH 3/6] chore: remove dot from generated pr title --- scripts/publish-new-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish-new-version.sh b/scripts/publish-new-version.sh index 34d37126c..ceb31bb23 100755 --- a/scripts/publish-new-version.sh +++ b/scripts/publish-new-version.sh @@ -145,7 +145,7 @@ publish_branch="publish-$docs_version" git checkout -b "$publish_branch" git add . -git commit -m "chore: Add release branches to the playbooks for release $docs_version." +git commit -m "chore: Add release branches to the playbooks for release $docs_version" # Push the branch if requested if [ "$push" = true ]; then From 67e973bd462d4293c79908638f655d59ff960dfb Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 30 Jul 2024 21:14:39 +0200 Subject: [PATCH 4/6] Revert "chore: make generated commits use conventional commit messages" This reverts commit 1f3534589b0cc5b40063d6fd6fe449eda0f646d1. --- scripts/publish-new-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish-new-version.sh b/scripts/publish-new-version.sh index ceb31bb23..c09ee375c 100755 --- a/scripts/publish-new-version.sh +++ b/scripts/publish-new-version.sh @@ -145,7 +145,7 @@ publish_branch="publish-$docs_version" git checkout -b "$publish_branch" git add . -git commit -m "chore: Add release branches to the playbooks for release $docs_version" +git commit -m "Add release branches to the playbooks for release $docs_version" # Push the branch if requested if [ "$push" = true ]; then From 094d2979576cbadfcf76b1ec1cbb4960b38c99c1 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 31 Jul 2024 14:46:18 +0200 Subject: [PATCH 5/6] remove module in xref for adoc in module --- modules/concepts/pages/stackable_resource_requests.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/concepts/pages/stackable_resource_requests.adoc b/modules/concepts/pages/stackable_resource_requests.adoc index b6a66c85e..9598a49dc 100644 --- a/modules/concepts/pages/stackable_resource_requests.adoc +++ b/modules/concepts/pages/stackable_resource_requests.adoc @@ -2,7 +2,7 @@ // WARNING: do not add headers here as they can break the structure of pages // that include this file. Stackable operators handle resource requests in a sligtly different manner than Kubernetes. -Resource requests are defined on xref:concepts:stacklet.adoc#roles[role] or xref:concepts:stacklet.adoc#role-groups[role group] level. +Resource requests are defined on xref:stacklet.adoc#roles[role] or xref:stacklet.adoc#role-groups[role group] level. On a role level this means that by default, all workers will use the same resource requests and limits. This can be further specified on role group level (which takes priority to the role level) to apply different resources. From 4d8e1b81e341cb3e10f0c4bc36e4e07f25303b91 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 1 Aug 2024 17:49:11 +0200 Subject: [PATCH 6/6] Revert "remove module in xref for adoc in module" This reverts commit 094d2979576cbadfcf76b1ec1cbb4960b38c99c1. --- modules/concepts/pages/stackable_resource_requests.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/concepts/pages/stackable_resource_requests.adoc b/modules/concepts/pages/stackable_resource_requests.adoc index 9598a49dc..b6a66c85e 100644 --- a/modules/concepts/pages/stackable_resource_requests.adoc +++ b/modules/concepts/pages/stackable_resource_requests.adoc @@ -2,7 +2,7 @@ // WARNING: do not add headers here as they can break the structure of pages // that include this file. Stackable operators handle resource requests in a sligtly different manner than Kubernetes. -Resource requests are defined on xref:stacklet.adoc#roles[role] or xref:stacklet.adoc#role-groups[role group] level. +Resource requests are defined on xref:concepts:stacklet.adoc#roles[role] or xref:concepts:stacklet.adoc#role-groups[role group] level. On a role level this means that by default, all workers will use the same resource requests and limits. This can be further specified on role group level (which takes priority to the role level) to apply different resources.