Merge branch 'feat/add-os-health-mon-guide' into staging

Signed-off-by: Kurt Garloff <[email protected]>
SovereignCloudStack · Mar 6, 2024 · 6b342fa · 6b342fa
2 parents 9f0f03f + 6ff1820
commit 6b342fa
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/community/cloud-resources/cloud-resources.md b/community/cloud-resources/cloud-resources.md
@@ -69,16 +69,16 @@ Service users will have their default_project_id set to a specific project and w
 | a07c811315ad40f585945b2939ef12dd | p500924-scs-zuul            | o-otte            | SCS Zuul                              | 30.11.2024   |
 | 1846709967a744b69f9eb48cac89bb04 | p500924-scs-k8s-e2e         | chess-knight      | E2E-Test for KaaS                     | ∞            |
 | 6ee4b373cb6d42a5bb59d5080987b70d | p500924-bitkeks             | bitkeks           | Cluster Stacks and Sec                | ∞            |
-| 4ea22ba875474d039cb57d20b7f710b5 | p500924-kaas-playground0    | jschoone          | Playground0 for KaaS-Hackathon        | 31.03.2024   |
-| 476672f1023b4bac8837f95a76881757 | p500924-kaas-playground1    | jschoone          | Playground1 for KaaS-Hackathon        | 31.03.2024   |
-| 04dac2927f744479a5d4c23dd0a3c378 | p500924-kaas-playground2    | jschoone          | Playground2 for KaaS-Hackathon        | 31.03.2024   |
-| 75279777029847ab9b399390c0dd6042 | p500924-kaas-playground3    | jschoone          | Playground3 for KaaS-Hackathon        | 31.03.2024   |
-| 0b3c75f80b6743778daccec0da423465 | p500924-kaas-playground4    | jschoone          | Playground4 for KaaS-Hackathon        | 31.03.2024   |
-| 2340a73644ca47189329061e9c2a0bfe | p500924-kaas-playground5    | jschoone          | Playground5 for KaaS-Hackathon        | 31.03.2024   |
-| 3c5bae4a233c4a9d8ae2e4b799d757c9 | p500924-kaas-playground6    | jschoone          | Playground6 for KaaS-Hackathon        | 31.03.2024   |
-| 03783b4952344c849af37d26818d19f0 | p500924-kaas-playground7    | jschoone          | Playground7 for KaaS-Hackathon        | 31.03.2024   |
-| 5c6d4d7183834eafbc20108ad647a9c0 | p500924-kaas-playground8    | jschoone          | Playground8 for KaaS-Hackathon        | 31.03.2024   |
-| 7e18881932f749baa7d547ebd407b8d8 | p500924-kaas-playground9    | jschoone          | Playground9 for KaaS-Hackathon        | 31.03.2024   |
+| 4ea22ba875474d039cb57d20b7f710b5 | p500924-kaas-playground0    | jschoone          | Playground0 for Hackathon             | 30.04.2024   |
+| 476672f1023b4bac8837f95a76881757 | p500924-kaas-playground1    | jschoone          | Playground1 for Hackathon             | 30.04.2024   |
+| 04dac2927f744479a5d4c23dd0a3c378 | p500924-kaas-playground2    | jschoone          | Playground2 for Hackathon             | 30.04.2024   |
+| 75279777029847ab9b399390c0dd6042 | p500924-kaas-playground3    | jschoone          | Playground3 for Hackathon             | 30.04.2024   |
+| 0b3c75f80b6743778daccec0da423465 | p500924-kaas-playground4    | jschoone          | Playground4 for Hackathon             | 30.04.2024   |
+| 2340a73644ca47189329061e9c2a0bfe | p500924-kaas-playground5    | jschoone          | Playground5 for Hackathon             | 30.04.2024   |
+| 3c5bae4a233c4a9d8ae2e4b799d757c9 | p500924-kaas-playground6    | jschoone          | Playground6 for Hackathon             | 30.04.2024   |
+| 03783b4952344c849af37d26818d19f0 | p500924-kaas-playground7    | jschoone          | Playground7 for Hackathon             | 30.04.2024   |
+| 5c6d4d7183834eafbc20108ad647a9c0 | p500924-kaas-playground8    | jschoone          | Playground8 for Hackathon             | 30.04.2024   |
+| 7e18881932f749baa7d547ebd407b8d8 | p500924-kaas-playground9    | jschoone          | Playground9 for Hackathon             | 30.04.2024   |
 |                                  |                             |                   |                                       |              |
 
 ## Wavecon

diff --git a/docs.package.json b/docs.package.json
@@ -52,5 +52,11 @@
     "source": "docs",
     "target": "docs/04-operating-scs/components",
     "label": "monitoring"
+  },
+  {
+    "repo": "SovereignCloudStack/openstack-health-monitor",
+    "source": "doc",
+    "target": "docs/04-operating-scs/guides",
+    "label": "monitoring"
   }
 ]
diff --git a/docs/index.mdx b/docs/index.mdx
@@ -37,7 +37,7 @@ manual.
 
 ### Container Layer
 
-#### k8s Cluster API Provider
+#### 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

diff --git 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,7 +251,12 @@ 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'
                   ]
                 }
               ]

diff --git a/static/data/architecturalOverviewData.json b/static/data/architecturalOverviewData.json
@@ -52,7 +52,7 @@
   "iaas": [
     {
       "title": "IaaS Layer",
-      "body": "SCS offers OpenStack infrastructure solutions based on KVM virutalization to deploy VM workloads and enabling the container layer optionally.",
+      "body": "SCS offers OpenStack infrastructure solutions based on KVM virtualization to deploy VM workloads and enabling the container layer optionally.",
       "url": "/docs/faq",
       "buttonText": "Learn More",
       "components": [

diff --git a/static/data/featureContentData.json b/static/data/featureContentData.json
@@ -13,7 +13,7 @@
   },
   {
     "title": "Frequently Asked Questions",
-    "body": "You are curious what SCS is all about, what it can do and what it cant?",
+    "body": "You are curious what SCS is all about, what it can do and what it can't?",
     "url": "/docs/faq",
     "buttonText": "Get Answers"
   },