diff --git a/docs.package.json b/docs.package.json
index 4550130191..11dae9699d 100644
--- a/docs.package.json
+++ b/docs.package.json
@@ -17,6 +17,12 @@
"target": "docs/03-container/components",
"label": "k8s-cluster-api-provider"
},
+ {
+ "repo": "SovereignCloudStack/cluster-stack-provider-openstack",
+ "source": "docs",
+ "target": "docs/03-container/components/cluster-stacks/components",
+ "label": "cluster-stack-provider-openstack"
+ },
{
"repo": "SovereignCloudStack/status-page-openapi",
"source": "docs",
@@ -25,10 +31,7 @@
},
{
"repo": "SovereignCloudStack/standards",
- "source": [
- "Standards/*.md",
- "Tests/scs-*.yaml"
- ],
+ "source": ["Standards/*.md", "Tests/scs-*.yaml"],
"target": "standards",
"label": ""
},
@@ -37,5 +40,17 @@
"source": "docs/guides",
"target": "docs/02-iaas/",
"label": ""
+ },
+ {
+ "repo": "SovereignCloudStack/k8s-harbor",
+ "source": "docs",
+ "target": "docs/03-container/components",
+ "label": "container-registry"
+ },
+ {
+ "repo": "SovereignCloudStack/k8s-observability",
+ "source": "docs",
+ "target": "docs/04-operating-scs/components",
+ "label": "monitoring"
}
]
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 542a0653ae..0000000000
--- a/docs/index.md
+++ /dev/null
@@ -1,182 +0,0 @@
----
-title: Introduction
-sidebar_position: 1
----
-
-[](http://creativecommons.org/licenses/by-sa/4.0/)
-
-## About
-
-The Sovereign Cloud Stack combines the best of Cloud Computing in one unified standard.
-SCS is built, backed, and operated by an active open-source community worldwide.
-As only the sum of different repositories complete the SCS Stack, it is important to have an easy and accessible documentation in one place.
-
-## What is SCS? Why should I care?
-
-SCS describes a standard as well as a reference implementation of this standard.
-
-Please see our [public web site](https://scs.community/) and specifically
-the [About SCS](https://scs.community/About/) page.
-
-## The reference implementation
-
-### Get it and test it: Testbed
-
-The easiest way to get in touch with SCS is to deploy a SCS cloud virtually.
-
-This means that you set up a SCS test installation including all the infrastructure
-pieces such as database, message queueing, ceph, monitoring and logging, IAM, the
-[OpenStack](https://openstack.org/) core services, and (soon) the Container layer
-on top of an existing
-IaaS platform. Currently, only OpenStack is supported as IaaS under the SCS cloud
-(so you end up using OpenStack on top of OpenStack — with nested virtualization
-enabled, this performs decently). There is no fundamental limitation — just
-noone has done the porting of the terraform recipes yet to AWS, libvirt,
-VMware, ...
-
-The SCS IaaS reference implementation is based on [OSISM](https://osism.tech/). Read on the
-[OSISM testbed docs](https://docs.osism.de/testbed/) to learn how to get the
-testbed running. Please read carefully through the
-[deployment](https://docs.osism.de/testbed/deployment.html) section of the
-manual.
-
-The [Requirements:Cloud access subsection](https://docs.osism.de/testbed/deployment.html#cloud-access) also lists some clouds that we have
-SCS running on and test regularly.
-
-You can easily deploy the container layer on top of the testbed (or a production
-SCS cloud of course) checking out the code from
-[k8s-cluster-api-provider](https://github.com/SovereignCloudStack/k8s-cluster-api-provider/).
-
-## Existing SCS Clouds
-
-A few production clouds are already based on SCS: betacloud and [pluscloud open](https://www.plusserver.com/en/products/pluscloud-open).
-More will come soon.
-
-CityNetwork, Open Telekom Cloud, OVH clouds are also known to support the
-testbed well. (There are a few caveats with the latter two, but those are
-documented and no blockers.) Read above mentioned
-[Requirements:Cloud access](https://docs.osism.de/testbed/deployment.html#cloud-access)
-subsections.
-
-## Development of SCS
-
-The work done in SCS is supposed to be fed back upstream — into the relevant
-CNCF projects, into OpenStack, into kolla-ansible, into OSISM and others.
-An OSISM deployment thus will bring you all the SCS greatness in the base
-layer.
-Whenever possible SCS works directly in the upstream projects. While the SCS
-projects tracks the efforts across the released in [epics and userstories](https://github.com/orgs/SovereignCloudStack/projects),
-the work on the code happens upstream - as such these repositories are usually
-not found in the SCS namespace.
-
-## Releases and Roadmap
-
-### Release 0 (2021-07-15)
-
-SCS R0 has been released on 2021-07-15 and bundles the work
-accomplished by the community prior to the full start of the project.
-
-See [Release Notes for R0](https://github.com/SovereignCloudStack/release-notes/blob/34d7ccb8f05b70cbb89f5995f9d10eab2ab8c052/Release0.md) for more information.
-
-### Release 1 (2021-09-29)
-
-R1 came quickly after R0 and was the first release to ship a production ready k8s stack
-(with k8s cluster API), some identity federation integration and much improved
-preconfiguration for monitoring and logging.
-
-See [Release Notes for R1](https://github.com/SovereignCloudStack/release-notes/blob/34d7ccb8f05b70cbb89f5995f9d10eab2ab8c052/Release1.md) for more information.
-
-### Release 2 (2022-03-23)
-
-This release delivers vast improvements for bare metal automation
-and the features in the container layers.
-
-See [Release Notes for R2](https://github.com/SovereignCloudStack/release-notes/blob/34d7ccb8f05b70cbb89f5995f9d10eab2ab8c052/Release2.md) for more information.
-
-### Release 3 (2022-09-21)
-
-Release 3 features user federation, increase in deployment and upgrade
-velocity by improving automated test coverage as well as bringing disk encryption
-based on tang from the state of a technical preview to be fully supported.
-
-See [Release Notes for R3](https://github.com/SovereignCloudStack/release-notes/blob/34d7ccb8f05b70cbb89f5995f9d10eab2ab8c052/Release3.md) for more information.
-
-### Release 4 (2023-03-22)
-
-The implemented open source components have been updated to the latest stable versions.
-Among others, this includes OpenStack Zed, Kubernetes Cluster API 1.3.x, Cluster API Provider
-for OpenStack 0.7.x, Kubernetes 1.26.x, and Ubuntu 22.04 LTS.
-
-See [Release Notes for R4](https://github.com/SovereignCloudStack/release-notes/blob/34d7ccb8f05b70cbb89f5995f9d10eab2ab8c052/Release4.md) for more information.
-
-### Release 5 (2023-09-20)
-
-The IaaS reference implementation now brings OpenStack 2023.1 (Antelope) and the default
-Ceph version is Ceph Quincy - both components are enabled by the OSISM 6.0.0 release.
-The container reference implementation has seen many updates is available as version 6.0.0,
-with Kubernetes v1.24 - 1.27 being officially supported. Furthermore this release brings
-the first technical preview of Cluster-Stack.
-
-See [Release Notes for R5](https://github.com/SovereignCloudStack/release-notes/blob/364103536ab2c51435a078171c698d7967d7588d/Release5.md) for more information.
-
-### Roadmap
-
-We have a 6 month release cadence — R6 will follow in March 2024.
-Until then, we will provide bugfixes and security fixes for R5.
-
-We do work towards a model where our partners can actually follow our main
-development branches — right now, our CI needs a bit more coverage though
-to make this safe.
-
-## Contribute and Connect
-
-Please see the [SCS contributor guide](https://docs.scs.community/community).
-
-## Standards, Conformity and Certification
-
-We intend to work on a conformity test suite.
-
-Right now, we are basically relying on upstream tests --
-[RefStack](https://refstack.openstack.org/) (to perform
-the [OpenStack trademark certification](https://refstack.openstack.org/#/guidelines)
-tests formerly known as DefCore) and the Kubernetes CNCF conformance tests run through
-[sonobuoy](https://sonobuoy.io/).
-
-We have specific [standards](https://github.com/SovereignCloudStack/standards/tree/main/Standards) aligned within the SCS community
-(and have also sought feedback from the broader Gaia-X and OpenStack communities).
-
-Beyond this, we have a [draft document](https://github.com/SovereignCloudStack/standards/blob/main/Drafts/SCS-Spec.md) that captures our
-view on how SCS compatible environments should look like. This one has not yet
-seen sufficient review to be eligible for standardization. However, we appreciate
-feedback (raise issues and PRs or start discussions).
-
-## Issues and bugs
-
-Please raise issues on github. If you can identify the affected component,
-raise the issue against the relevant repository in the SovereignCloudStack
-or OSISM space. Otherwise you can use
-the [issues repository](https://github.com/SovereignCloudStack/issues).
-Obviously we appreciate PRs even more than issues;
-please don't forget to sign off your contributions (see
-[contributor guide](https://docs.scs.community/community) ).
-
-When reporting bugs, it is very useful to include some standard information
-typically needed to analyze:
-
-- What state of software (SCS) were you testing? What version numbers ... ?
-- How does your environment look like (hardware, operating systems, etc.)?
-- What did you do?
-- What did you expect? What happened instead?
-- Have you done this successfully before? What changed?
-- Can this be reproduced? Occasionally? Reliably? How?
-- Any analysis you have done? Experiments and their results? Log files?
-
-## Other resources
-
-Please check our main [web page](https://scs.community/).
-If you are an onboarded SCS community member, find here a link to our
-[nextcloud](https://scs.sovereignit.de/) (login required).
-
-Our community interacts through our [github organization](https://github.com/sovereignCloudStack/),
-on [mailing lists](https://scs.sovereignit.de/mailman3/postorius/lists/) as well as
-chats [matrix.org:SCS](https://matrix.to/#/!TiDqlLmEUaXqTemaLc:matrix.org?via=matrix.org).
diff --git a/docs/index.mdx b/docs/index.mdx
new file mode 100644
index 0000000000..8f8d1fe77a
--- /dev/null
+++ b/docs/index.mdx
@@ -0,0 +1,81 @@
+---
+title: Introduction
+sidebar_position: 1
+---
+
+import ArchitecturalModel from '../src/components/ArchitecturalModel'
+
+## About
+
+The Sovereign Cloud Stack combines the best of Cloud Computing in one unified standard.
+SCS is built, backed, and operated by an active open-source community worldwide.
+
+## Architectural Overview
+
+
+
+## Use Cases and Deployment Examples
+
+### IaaS Layer
+
+#### Quick Start with Cloud-In-A-Box
+
+The fastest way to get in touch with SCS is to deploy a SCS cloud virtually. The Cloud-In-A-Box was built explicitly for this scenario. Check it out [here](/docs/iaas/guides/deploy-guide/examples/cloud-in-a-box)
+
+#### Reference Implementation Testbed
+
+This means that you set up an SCS test installation including all the infrastructure
+pieces such as database, message queueing, ceph, monitoring and logging, IAM, the
+[OpenStack](https://openstack.org/) core services, and (soon) the Container layer
+on top of an existing IaaS platform.
+
+The SCS IaaS reference implementation is based on [OSISM](https://osism.tech/). Read on the
+[OSISM testbed docs](https://docs.osism.de/testbed/) to learn how to get the
+testbed running. Please read carefully through the
+[deployment](https://docs.osism.de/testbed/deployment.html) section of the
+manual.
+
+### Container Layer
+
+#### K8s Cluster API Provider
+
+You can easily deploy the container layer on top of the testbed (or a production
+SCS cloud) checking out the code from
+[k8s-cluster-api-provider](https://github.com/SovereignCloudStack/k8s-cluster-api-provider/).
+
+#### Cluster Stacks
+
+With the Cluster Stacks, in the V2 KaaS reference implementation, we provide an opinionated optimized configuration of Kubernetes clusters. Through better packaging, integrated testing, and bundled configuration, SCS-based Kubernetes clusters provide easier individualization.
+Throughout the R6 development cycle Cluster Stacks are taken from a technical preview to be [functional and available on top of the IaaS reference implementation](https://github.com/SovereignCloudStack/issues/milestone/8) as well to replace the V1 KaaS reference implementation [k8s-cluster-api-provider](https://github.com/SovereignCloudStack/k8s-cluster-api-provider/).
+The Cluster Stacks can already be tried with the [demo](https://github.com/SovereignCloudStack/cluster-stacks-demo) repository. Although this is based on the not-production-ready Docker provider, the usage is the same for every provider.
+
+### Public SCS Clouds in production
+
+Find the current list of scs compatible clouds [here](https://docs.scs.community/standards/certification/overview#compliant-cloud-environments).
+
+### Development of SCS
+
+While the SCS project tracks the efforts across the released epics and user stories, the work on the code, whenever possible, happens upstream. As such, these repositories are usually not found in the SCS GitHub organization. SCS works directly in the following upstream projects:
+
+- CNCF projects,
+- OpenStack,
+- kolla-ansible,
+- OSISM and others.
+
+All code not pushed upstream can be found in the [SCS Github organization](https://github.com/SovereignCloudStack).
+
+### Issues and Bugs
+
+If you can identify the affected component, raise the issue against the relevant repository in the SovereignCloudStack or OSISM space. Otherwise, you can use the [issues repository](https://github.com/SovereignCloudStack/issues). We appreciate PRs as well as issues; please don't forget to sign off your contributions see [contributor guide](https://docs.scs.community/community).
+
+### Contribute and Connect
+
+Please see the [SCS contributor guide](https://docs.scs.community/community).
+
+### Releases and Roadmap
+
+See our Release Notes [here](https://docs.scs.community/docs/category/releases)
+
+## Standards, Conformity and Certification
+
+How to get compliant? What do I need to be compliant? What are the benefits? What does it involve? What to expect in the future? Learn more in the [standards section](https://docs.scs.community/standards).
diff --git a/docusaurus.config.js b/docusaurus.config.js
index d04dfc7ced..3692bf811e 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -90,7 +90,8 @@ const config = {
sidebarPath: require.resolve('./sidebarsStandards.js')
}
],
- './src/plugins/docusaurus-plugin-matomo-analytics/index.js'
+ './src/plugins/docusaurus-plugin-matomo-analytics/index.js',
+ './src/plugins/docusaurus-plugin-global-data/index.js'
],
themeConfig:
diff --git a/sidebarsDocs.js b/sidebarsDocs.js
index 90ae6cd7e0..955ab24bd2 100644
--- a/sidebarsDocs.js
+++ b/sidebarsDocs.js
@@ -240,6 +240,7 @@ const sidebarsDocs = {
'container/components/k8s-cluster-api-provider/doc/Maintenance_and_Troubleshooting',
'container/components/k8s-cluster-api-provider/doc/LoadBalancer-ExtTrafficLocal',
'container/components/k8s-cluster-api-provider/doc/Upgrade-Guide',
+ 'container/components/k8s-cluster-api-provider/doc/continuous-integration',
'container/components/k8s-cluster-api-provider/doc/roadmap',
{
type: 'category',
@@ -250,10 +251,51 @@ const sidebarsDocs = {
'container/components/k8s-cluster-api-provider/doc/usage/managing-many-clusters',
'container/components/k8s-cluster-api-provider/doc/usage/cluster-mgmt-capi-mgmt-node',
'container/components/k8s-cluster-api-provider/doc/usage/multi-az-and-multi-cloud-environments',
- 'container/components/k8s-cluster-api-provider/doc/usage/testing'
+ 'container/components/k8s-cluster-api-provider/doc/usage/testing',
+ 'container/components/k8s-cluster-api-provider/doc/usage/containter-registry-configuration',
+ 'container/components/k8s-cluster-api-provider/doc/usage/custom-ca',
+ 'container/components/k8s-cluster-api-provider/doc/usage/gateway-api',
+ 'container/components/k8s-cluster-api-provider/doc/usage/harbor',
+ 'container/components/k8s-cluster-api-provider/doc/usage/migrate-to-cluster-class'
]
}
]
+ },
+ {
+ 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: 'Container Registry',
+ link: {
+ type: 'generated-index'
+ },
+ items: [
+ 'container/components/container-registry/docs/quickstart',
+ 'container/components/container-registry/docs/scs-deployment',
+ 'container/components/container-registry/docs/rate_limit',
+ 'container/components/container-registry/docs/upgrade',
+ 'container/components/container-registry/docs/backup_and_restore',
+ 'container/components/container-registry/docs/migration',
+ 'container/components/container-registry/docs/persistence',
+ 'container/components/container-registry/docs/ha-deployment'
+ ]
}
]
}
@@ -286,6 +328,26 @@ const sidebarsDocs = {
'operating-scs/components/status-page/docs/components',
'operating-scs/components/status-page/docs/levels_of_consensus'
]
+ },
+ {
+ type: 'category',
+ label: 'Monitoring',
+ link: {
+ type: 'generated-index'
+ },
+ items: [
+ 'operating-scs/components/monitoring/docs/overview',
+ 'operating-scs/components/monitoring/docs/quickstart',
+ 'operating-scs/components/monitoring/docs/scs-deployment',
+ 'operating-scs/components/monitoring/docs/infrastructure_services',
+ 'operating-scs/components/monitoring/docs/iaas',
+ 'operating-scs/components/monitoring/docs/kaas',
+ 'operating-scs/components/monitoring/docs/zuul',
+ 'operating-scs/components/monitoring/docs/alertmanager',
+ 'operating-scs/components/monitoring/docs/oauth',
+ 'operating-scs/components/monitoring/docs/tracing',
+ 'operating-scs/components/monitoring/docs/tuning'
+ ]
}
]
},
diff --git a/src/components/ArchitecturalModel.tsx b/src/components/ArchitecturalModel.tsx
new file mode 100644
index 0000000000..475b5b3d50
--- /dev/null
+++ b/src/components/ArchitecturalModel.tsx
@@ -0,0 +1,122 @@
+import React, { useEffect, useState } from 'react'
+import ContentCard from './ContentCard'
+import styles from './architecturalmodel.module.css'
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext'
+import { GlobalData } from '../pages'
+
+interface ArchitecturalLayerItem {
+ title: string
+ body: string
+ url: string
+ buttonText: string
+ components?: []
+}
+
+export interface ArchitecturalLayerData {
+ ops: ArchitecturalLayerItem[]
+ container: ArchitecturalLayerItem[]
+ iaas: ArchitecturalLayerItem[]
+ iam: ArchitecturalLayerItem[]
+}
+
+interface ArchitecturalModelProps {
+ topLayers?: boolean
+}
+
+const ArchitecturalModel: React.FunctionComponent = (
+ props
+) => {
+ const { topLayers } = props
+ const context = useDocusaurusContext()
+ const globalData = context.globalData as unknown as GlobalData
+ const data =
+ globalData['global-data-plugin'].default.architecturalOverviewData
+
+ if (!data) {
+ return