From 441f24e858734a782ffaf0d530f7694500ee34f6 Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:11:57 +0200 Subject: [PATCH 1/6] feat(cluster-stacks): add csctl Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> --- docs.package.json | 13 ++++++++++++- sidebarsDocs.js | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs.package.json b/docs.package.json index d5e8ea08b6..308ab460b5 100644 --- a/docs.package.json +++ b/docs.package.json @@ -74,7 +74,12 @@ }, { "repo": "SovereignCloudStack/scs-health-monitor", - "source": ["docs/overview.md", "docs/Workflow.md", "docs/Testflow.md", "docs/ObservabilityStack/SetupObservabilityStack.md"], + "source": [ + "docs/overview.md", + "docs/Workflow.md", + "docs/Testflow.md", + "docs/ObservabilityStack/SetupObservabilityStack.md" + ], "target": "docs/04-operating-scs/components", "label": "scs-health-monitor" }, @@ -95,5 +100,11 @@ "source": "docs/images/*.png", "target": "docs/04-operating-scs/components", "label": "automated-pentesting/images" + }, + { + "repo": "SovereignCloudStack/csctl", + "source": "docs/*.md", + "target": "docs/03-container/components/cluster-stacks/components", + "label": "csctl" } ] diff --git a/sidebarsDocs.js b/sidebarsDocs.js index 036014ff09..c3fb3db8c4 100644 --- a/sidebarsDocs.js +++ b/sidebarsDocs.js @@ -173,6 +173,16 @@ const sidebarsDocs = { 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/controllers', 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/develop' ] + }, + { + type: 'category', + label: 'csctl', + items: [ + 'container/components/cluster-stacks/components/csctl/overview', + 'container/components/cluster-stacks/components/csctl/quickstart', + 'container/components/cluster-stacks/components/csctl/getting_started', + 'container/components/cluster-stacks/components/csctl/developing-and-testing-csctl' + ] } ] }, From 47724749b1b643441ea8c2b2107d08eea420d79a Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:18:04 +0200 Subject: [PATCH 2/6] chore(container layer): switch cluster stacks and k8s-cluster-api-provider Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> --- sidebarsDocs.js | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/sidebarsDocs.js b/sidebarsDocs.js index c3fb3db8c4..d1b082daa3 100644 --- a/sidebarsDocs.js +++ b/sidebarsDocs.js @@ -120,6 +120,35 @@ const sidebarsDocs = { type: 'generated-index' }, items: [ + { + type: 'category', + label: 'Cluster Stacks', + link: { + type: 'generated-index' + }, + items: [ + { + type: 'category', + label: 'Cluster Stack Provider OpenStack', + items: [ + 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/overview', + 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/quickstart', + 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/controllers', + 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/develop' + ] + }, + { + type: 'category', + label: 'csctl', + items: [ + 'container/components/cluster-stacks/components/csctl/overview', + 'container/components/cluster-stacks/components/csctl/quickstart', + 'container/components/cluster-stacks/components/csctl/getting_started', + 'container/components/cluster-stacks/components/csctl/developing-and-testing-csctl' + ] + } + ] + }, { type: 'category', label: 'K8s Cluster API Provider', @@ -157,35 +186,6 @@ const sidebarsDocs = { } ] }, - { - type: 'category', - label: 'Cluster Stacks', - link: { - type: 'generated-index' - }, - items: [ - { - type: 'category', - label: 'Cluster Stack Provider OpenStack', - items: [ - 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/overview', - 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/quickstart', - 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/controllers', - 'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/develop' - ] - }, - { - type: 'category', - label: 'csctl', - items: [ - 'container/components/cluster-stacks/components/csctl/overview', - 'container/components/cluster-stacks/components/csctl/quickstart', - 'container/components/cluster-stacks/components/csctl/getting_started', - 'container/components/cluster-stacks/components/csctl/developing-and-testing-csctl' - ] - } - ] - }, { type: 'category', label: 'Container Registry', From 9ba67592bb3ac2b9bc9b3d16062a59ae7f4e3d42 Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:23:54 +0200 Subject: [PATCH 3/6] feat(cluster-stacks): add cluster stacks itself Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> --- docs.package.json | 6 ++++++ sidebarsDocs.js | 1 + 2 files changed, 7 insertions(+) diff --git a/docs.package.json b/docs.package.json index 308ab460b5..48932381b0 100644 --- a/docs.package.json +++ b/docs.package.json @@ -106,5 +106,11 @@ "source": "docs/*.md", "target": "docs/03-container/components/cluster-stacks/components", "label": "csctl" + }, + { + "repo": "SovereignCloudStack/cluster-stacks", + "source": "docs/overview.md", + "target": "docs/03-container/components/cluster-stacks/components", + "label": "cluster-stacks" } ] diff --git a/sidebarsDocs.js b/sidebarsDocs.js index d1b082daa3..2c4a0014a1 100644 --- a/sidebarsDocs.js +++ b/sidebarsDocs.js @@ -127,6 +127,7 @@ const sidebarsDocs = { type: 'generated-index' }, items: [ + 'container/components/cluster-stacks/components/cluster-stacks/overview', { type: 'category', label: 'Cluster Stack Provider OpenStack', From d6cef059a68aa98ab40c4339f1f71c6436e91286 Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:48:00 +0200 Subject: [PATCH 4/6] feat(cluster-stacks): add cluster-stack-operator card Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> --- docs.package.json | 12 ++++++++++++ sidebarsDocs.js | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/docs.package.json b/docs.package.json index 48932381b0..7cb33f96d4 100644 --- a/docs.package.json +++ b/docs.package.json @@ -112,5 +112,17 @@ "source": "docs/overview.md", "target": "docs/03-container/components/cluster-stacks/components", "label": "cluster-stacks" + }, + { + "repo": "SovereignCloudStack/cluster-stack-operator", + "source": ["docs/architecture/overview.md"], + "target": "docs/03-container/components/cluster-stacks/components", + "label": "cluster-stack-operator" + }, + { + "repo": "SovereignCloudStack/cluster-stack-operator", + "source": ["docs/pics/syself-cluster-stacks-web.png"], + "target": "docs/03-container/components/cluster-stacks/components", + "label": "pics" } ] diff --git a/sidebarsDocs.js b/sidebarsDocs.js index 2c4a0014a1..053cfce2c3 100644 --- a/sidebarsDocs.js +++ b/sidebarsDocs.js @@ -128,6 +128,13 @@ const sidebarsDocs = { }, items: [ 'container/components/cluster-stacks/components/cluster-stacks/overview', + { + type: 'category', + label: 'Cluster Stack Operator', + items: [ + 'container/components/cluster-stacks/components/cluster-stack-operator/overview' + ] + }, { type: 'category', label: 'Cluster Stack Provider OpenStack', From 41457fe1ffa77c7260db58144050372c5002ec62 Mon Sep 17 00:00:00 2001 From: Danny Eiselt Date: Mon, 26 Aug 2024 12:04:57 +0200 Subject: [PATCH 5/6] changed: CSO structure Signed-off-by: Danny Eiselt --- docs.package.json | 9 +-------- sidebarsDocs.js | 5 ++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docs.package.json b/docs.package.json index 7cb33f96d4..befbc594c4 100644 --- a/docs.package.json +++ b/docs.package.json @@ -41,7 +41,6 @@ "target": "docs/03-container/components", "label": "container-registry" }, - { "repo": "SovereignCloudStack/status-page-openapi", "source": "docs", @@ -115,14 +114,8 @@ }, { "repo": "SovereignCloudStack/cluster-stack-operator", - "source": ["docs/architecture/overview.md"], + "source": ["docs/*"], "target": "docs/03-container/components/cluster-stacks/components", "label": "cluster-stack-operator" - }, - { - "repo": "SovereignCloudStack/cluster-stack-operator", - "source": ["docs/pics/syself-cluster-stacks-web.png"], - "target": "docs/03-container/components/cluster-stacks/components", - "label": "pics" } ] diff --git a/sidebarsDocs.js b/sidebarsDocs.js index 053cfce2c3..b317b5e6cb 100644 --- a/sidebarsDocs.js +++ b/sidebarsDocs.js @@ -132,7 +132,10 @@ const sidebarsDocs = { type: 'category', label: 'Cluster Stack Operator', items: [ - 'container/components/cluster-stacks/components/cluster-stack-operator/overview' + 'container/components/cluster-stacks/components/cluster-stack-operator/architecture/overview', + 'container/components/cluster-stacks/components/cluster-stack-operator/topics/quickstart', + 'container/components/cluster-stacks/components/cluster-stack-operator/topics/troubleshoot', + 'container/components/cluster-stacks/components/cluster-stack-operator/develop/develop' ] }, { From 1738916a985ece015f4fc00ae08e431f21a2349b Mon Sep 17 00:00:00 2001 From: Danny Eiselt Date: Tue, 27 Aug 2024 10:43:10 +0200 Subject: [PATCH 6/6] added: predefined cluster stacks Signed-off-by: Danny Eiselt --- docs.package.json | 2 +- sidebarsDocs.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docs.package.json b/docs.package.json index befbc594c4..31221f74f7 100644 --- a/docs.package.json +++ b/docs.package.json @@ -108,7 +108,7 @@ }, { "repo": "SovereignCloudStack/cluster-stacks", - "source": "docs/overview.md", + "source": "docs/*", "target": "docs/03-container/components/cluster-stacks/components", "label": "cluster-stacks" }, diff --git a/sidebarsDocs.js b/sidebarsDocs.js index b317b5e6cb..cf46e9bb14 100644 --- a/sidebarsDocs.js +++ b/sidebarsDocs.js @@ -157,6 +157,20 @@ const sidebarsDocs = { 'container/components/cluster-stacks/components/csctl/getting_started', 'container/components/cluster-stacks/components/csctl/developing-and-testing-csctl' ] + }, + { + type: 'category', + label: 'Predefined Cluster Stacks', + items: [ + { + type: 'category', + label: 'Openstack', + items: [ + 'container/components/cluster-stacks/components/cluster-stacks/providers/openstack/quickstart', + 'container/components/cluster-stacks/components/cluster-stacks/providers/openstack/configuration' + ] + } + ] } ] },