diff --git a/content/rancher/v2.x/en/installation/upgrades-rollbacks/rollbacks/_index.md b/content/rancher/v2.x/en/installation/upgrades-rollbacks/rollbacks/_index.md index d595b448dae..4af727bf04b 100644 --- a/content/rancher/v2.x/en/installation/upgrades-rollbacks/rollbacks/_index.md +++ b/content/rancher/v2.x/en/installation/upgrades-rollbacks/rollbacks/_index.md @@ -13,7 +13,7 @@ Restoring a snapshot of the Rancher Server cluster will revert Rancher to the ve >**Note:** Managed clusters are authoritative for their state. This means restoring the rancher server will not revert workload deployments or changes made on managed clusters after the snapshot was taken. -- [Rolling back Rancher installed with Docker]({{}}/rancher/v2.x/en/upgrades/rollbacks/single-node-rollbacks/) +- [Rolling back Rancher installed with Docker]({{}}/rancher/v2.x/en/installation/other-installation-methods/single-node-docker/single-node-rollbacks) - [Rolling back Rancher installed on a Kubernetes cluster]({{}}/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/) ### Special Scenarios regarding Rollbacks diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/_index.md similarity index 94% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/_index.md index 2d5b45a3724..6bfd1026f98 100644 --- a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/_index.md @@ -1,5 +1,5 @@ --- -title: Legacy +title: Kubernetes Resources weight: 19 aliases: - /rancher/v2.x/en/concepts/ @@ -7,7 +7,7 @@ aliases: - /rancher/v2.x/en/concepts/resources/ --- -When your project is set up, [project members]({{}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#project-roles) can start managing their applications and all the components that comprise it. +> The **Cluster Explorer** is a new feature in Rancher v2.5 that allows you to view and manipulate all of the custom resources and CRDs in a Kubernetes cluster from the Rancher UI. This section will be updated to reflect the way that Kubernetes resources are handled in Rancher v2.5. ## Workloads diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/certificates/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/certificates/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/certificates/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/certificates/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/configmaps/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/configmaps/_index.md similarity index 99% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/configmaps/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/configmaps/_index.md index 4b0161169bb..062796fc030 100644 --- a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/configmaps/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/configmaps/_index.md @@ -6,7 +6,6 @@ aliases: - /rancher/v2.x/en/k8s-in-rancher/configmaps --- - While most types of Kubernetes secrets store sensitive information, [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) store general configuration information, such as a group of config files. Because ConfigMaps don't store sensitive information, they can be updated automatically, and therefore don't require their containers to be restarted following update (unlike most secret types, which require manual updates and a container restart to take effect). ConfigMaps accept key value pairs in common string formats, like config files or JSON blobs. After you upload a config map, any workload can reference it as either an environment variable or a volume mount. diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-background/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-background/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-background/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-background/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-for-rancher-before-2_0_7/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-for-rancher-before-2_0_7/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-for-rancher-before-2_0_7/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-for-rancher-before-2_0_7/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-kubectl/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-kubectl/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-kubectl/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-kubectl/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-rancher-ui/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-rancher-ui/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-rancher-ui/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-rancher-ui/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/testing-hpa/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/testing-hpa/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/horitzontal-pod-autoscaler/testing-hpa/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/testing-hpa/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/load-balancers-and-ingress/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/load-balancers-and-ingress/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/load-balancers-and-ingress/ingress/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/ingress/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/load-balancers-and-ingress/ingress/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/ingress/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/load-balancers-and-ingress/load-balancers/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/load-balancers/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/load-balancers-and-ingress/load-balancers/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/load-balancers/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/registries/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/registries/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/registries/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/registries/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/secrets/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/secrets/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/secrets/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/secrets/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/service-discovery/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/service-discovery/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/service-discovery/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/service-discovery/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/workloads/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/workloads/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/add-a-sidecar/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/workloads/add-a-sidecar/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/add-a-sidecar/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/workloads/add-a-sidecar/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/deploy-workloads/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/workloads/deploy-workloads/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/deploy-workloads/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/workloads/deploy-workloads/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/rollback-workloads/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/workloads/rollback-workloads/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/rollback-workloads/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/workloads/rollback-workloads/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/upgrade-workloads/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/workloads/upgrade-workloads/_index.md similarity index 100% rename from content/rancher/v2.x/en/k8s-resources/k8s-in-rancher/workloads/upgrade-workloads/_index.md rename to content/rancher/v2.x/en/k8s-in-rancher/workloads/upgrade-workloads/_index.md diff --git a/content/rancher/v2.x/en/k8s-resources/_index.md b/content/rancher/v2.x/en/k8s-resources/_index.md deleted file mode 100644 index 22cf85c68bc..00000000000 --- a/content/rancher/v2.x/en/k8s-resources/_index.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Kubernetes Resources -weight: 10 -aliases: - - /rancher/v2.x/en/k8s-in-rancher ---- - - -### About the Cluster Explorer - -_Available as of v2.5_ - -The cluster explorer is a new feature in Rancher v2.5 that allows you to view and manipulate all of the custom resources and CRDs in a Kubernetes cluster from the Rancher UI. diff --git a/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/cluster-metrics/_index.md b/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/cluster-metrics/_index.md index 76764df6c0a..02f6b191c45 100644 --- a/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/cluster-metrics/_index.md +++ b/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/cluster-metrics/_index.md @@ -2,8 +2,8 @@ title: Cluster Metrics weight: 3 aliases: - - rancher/v2.x/en/project-admin/tools/monitoring/cluster-metrics - - rancher/v2.x/en/cluster-admin/tools/monitoring/cluster-metrics + - /rancher/v2.x/en/project-admin/tools/monitoring/cluster-metrics + - /rancher/v2.x/en/cluster-admin/tools/monitoring/cluster-metrics --- _Available as of v2.2.0_ diff --git a/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/custom-metrics/_index.md b/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/custom-metrics/_index.md index 3ec611813a5..875bc0c0a65 100644 --- a/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/custom-metrics/_index.md +++ b/content/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/custom-metrics/_index.md @@ -3,8 +3,6 @@ title: Prometheus Custom Metrics Adapter weight: 5 aliases: - rancher/v2.x/en/project-admin/tools/monitoring/custom-metrics - - rancher/v2.x/en/cluster-admin/tools/monitoring/cluster-metrics - - /rancher/v2.x/en/cluster-admin/tools/monitoring/custom-metrics --- After you've enabled [cluster level monitoring]({{< baseurl >}}/rancher/v2.x/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/#enabling-cluster-monitoring), You can view the metrics data from Rancher. You can also deploy the Prometheus custom metrics adapter then you can use the HPA with metrics stored in cluster monitoring. diff --git a/content/rancher/v2.x/en/pipelines/config/_index.md b/content/rancher/v2.x/en/pipelines/config/_index.md index 210e4c41b13..0d7ae485475 100644 --- a/content/rancher/v2.x/en/pipelines/config/_index.md +++ b/content/rancher/v2.x/en/pipelines/config/_index.md @@ -606,7 +606,7 @@ To configure compute resources for pipeline-step containers: You can configure compute resources for pipeline-step containers in the `.rancher-pipeline.yml` file. -In a [step type]({{}}/rancher/v2.x/en/k8s-in-rancher/pipelines/#step-types), you will provide the following information: +In a step, you will provide the following information: * **CPU Reservation (`CpuRequest`)**: CPU request for the container of a pipeline step. * **CPU Limit (`CpuLimit`)**: CPU limit for the container of a pipeline step. diff --git a/content/rancher/v2.x/en/pipelines/example-repos/_index.md b/content/rancher/v2.x/en/pipelines/example-repos/_index.md index aa8cb80e91b..49e00c6c821 100644 --- a/content/rancher/v2.x/en/pipelines/example-repos/_index.md +++ b/content/rancher/v2.x/en/pipelines/example-repos/_index.md @@ -74,4 +74,4 @@ After enabling an example repository, run the pipeline to see how it works. ### What's Next? -For detailed information about setting up your own pipeline for your repository, [configure a version control provider]({{}}/rancher/v2.x/en/project-admin/pipelines), [enable a repository](#configure-repositories) and finally [configure your pipeline]({{}}/rancher/v2.x/en/k8s-in-rancher/pipelines/#pipeline-configuration). +For detailed information about setting up your own pipeline for your repository, [configure a version control provider]({{}}/rancher/v2.x/en/project-admin/pipelines), [enable a repository](#configure-repositories) and finally [configure your pipeline]({{}}/rancher/v2.x/en/k8s-in-rancher/pipelines/#pipeline-configuration-reference).