diff --git a/docs/getting-started/overview.md b/docs/getting-started/overview.md index e3ce3257eaa..8b3888e2150 100644 --- a/docs/getting-started/overview.md +++ b/docs/getting-started/overview.md @@ -35,18 +35,11 @@ The Rancher API server is built on top of an embedded Kubernetes API server and ### Working with Kubernetes -<<<<<<< HEAD:docs/getting-started/overview.md - **Provisioning Kubernetes clusters:** The Rancher API server can [provision Kubernetes](../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md) on existing nodes, or perform [Kubernetes upgrades.](installation-and-upgrade/upgrade-and-roll-back-kubernetes.md) - **Catalog management:** Rancher provides the ability to use a [catalog of Helm charts](../pages-for-subheaders/helm-charts-in-rancher.md) that make it easy to repeatedly deploy applications. - **Managing projects:** A project is a group of multiple namespaces and access control policies within a cluster. A project is a Rancher concept, not a Kubernetes concept, which allows you to manage multiple namespaces as a group and perform Kubernetes operations in them. The Rancher UI provides features for [project administration](../pages-for-subheaders/manage-projects.md) and for [managing applications within projects.](../pages-for-subheaders/kubernetes-resources-setup.md) - **Fleet Continuous Delivery:** Within Rancher, you can leverage [Fleet Continuous Delivery](../pages-for-subheaders/fleet-gitops-at-scale.md) to deploy applications from git repositories, without any manual operation, to targeted downstream Kubernetes clusters. - **Istio:** Our [integration with Istio](../pages-for-subheaders/istio.md) is designed so that a Rancher operator, such as an administrator or cluster owner, can deliver Istio to developers. Then developers can use Istio to enforce security policies, troubleshoot problems, or manage traffic for green/blue deployments, canary deployments, or A/B testing. -======= -- **Provisioning Kubernetes clusters:** The Rancher API server can [provision Kubernetes](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md) on existing nodes, or perform [Kubernetes upgrades.](../installation-and-upgrade/upgrade-and-roll-back-kubernetes.md) -- **Catalog management:** Rancher provides the ability to use a [catalog of Helm charts](../../pages-for-subheaders/helm-charts-in-rancher.md) that make it easy to repeatedly deploy applications. -- **Managing projects:** A project is a group of multiple namespaces and access control policies within a cluster. A project is a Rancher concept, not a Kubernetes concept, which allows you to manage multiple namespaces as a group and perform Kubernetes operations in them. The Rancher UI provides features for [project administration](../../pages-for-subheaders/manage-projects.md) and for [managing applications within projects.](../../pages-for-subheaders/kubernetes-resources-setup.md) -- **Istio:** Our [integration with Istio](../../pages-for-subheaders/istio.md) is designed so that a Rancher operator, such as an administrator or cluster owner, can deliver Istio to developers. Then developers can use Istio to enforce security policies, troubleshoot problems, or manage traffic for green/blue deployments, canary deployments, or A/B testing. ->>>>>>> a99263eb10... remove pipeline references:docs/getting-started/introduction/overview.md ### Working with Cloud Infrastructure diff --git a/sidebars.js b/sidebars.js index d1ebc5feb2f..a98e3920d90 100644 --- a/sidebars.js +++ b/sidebars.js @@ -23,14 +23,14 @@ const sidebars = { { type: 'category', label: 'Getting Started', - items: [ + items: [ "getting-started/overview", { type: 'category', label: 'Quick Start Guides', link: { type: 'doc', - id: "pages-for-subheaders/quick-start-guides", + id: "pages-for-subheaders/quick-start-guides", }, items: [ { @@ -232,7 +232,7 @@ const sidebars = { "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml", "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity", "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml", - ] + ] }, { type: 'category', @@ -507,7 +507,7 @@ const sidebars = { id: "pages-for-subheaders/launch-kubernetes-with-rancher", }, items: [ - { + { type: 'category', label: 'Use New Nodes in an Infra Provider', link: { @@ -653,7 +653,7 @@ const sidebars = { }, "how-to-guides/new-user-guides/add-users-to-projects", - "how-to-guides/new-user-guides/manage-namespaces", + "how-to-guides/new-user-guides/manage-namespaces", ] }, { @@ -672,7 +672,8 @@ const sidebars = { id: "pages-for-subheaders/manage-projects", }, items: [ - "how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines", + "how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects", + "how-to-guides/advanced-user-guides/manage-projects/manage-namespaces", "how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies", { type: 'category', @@ -1050,21 +1051,6 @@ const sidebars = { "reference-guides/system-tools", "reference-guides/rke1-template-example-yaml", - { - type: 'category', - label: 'Pipelines', - link: { - type: 'doc', - id: "pages-for-subheaders/pipelines", - }, - items: [ - "reference-guides/pipelines/concepts", - "reference-guides/pipelines/pipeline-configuration", - "reference-guides/pipelines/configure-persistent-data", - "reference-guides/pipelines/example-repositories", - "reference-guides/pipelines/example-yaml", - ], - }, { type: 'category', label: 'Rancher Security', diff --git a/versioned_sidebars/version-2.5-sidebars.json b/versioned_sidebars/version-2.5-sidebars.json index 0e3ab49167f..0d2db94e85f 100644 --- a/versioned_sidebars/version-2.5-sidebars.json +++ b/versioned_sidebars/version-2.5-sidebars.json @@ -691,7 +691,6 @@ "items": [ "how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects", "how-to-guides/advanced-user-guides/manage-projects/manage-namespaces", - "how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines", "how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies", { "type": "category", @@ -1034,21 +1033,6 @@ "reference-guides/rancher-project-tools", "reference-guides/system-tools", "reference-guides/rke1-template-example-yaml", - { - "type": "category", - "label": "Pipelines", - "link": { - "type": "doc", - "id": "pages-for-subheaders/pipelines" - }, - "items": [ - "reference-guides/pipelines/concepts", - "reference-guides/pipelines/pipeline-configuration", - "reference-guides/pipelines/configure-persistent-data", - "reference-guides/pipelines/example-repositories", - "reference-guides/pipelines/example-yaml" - ] - }, { "type": "category", "label": "Rancher Security",