Merge branch 'main' into move-pages-for-subheaders-2.5

2026-05-17 02:23:19 +00:00 · 2024-01-23 15:06:39 -08:00
parent d8f25f1e7c fe366979ff
commit 67c7ebcf1a
1083 changed files with 8112 additions and 4921 deletions
@@ -132,18 +132,11 @@ The following table summarizes the different features available for each CNI net

 - Ingress/Egress Policies: This feature allows you to manage routing control for both Kubernetes and non-Kubernetes communications.

-#### CNI Community Popularity
+### CNI Community Popularity

-The following table summarizes different GitHub metrics to give you an idea of each project's popularity and activity. This data was collected in January 2020.
+import CNIPopularityTable from '/shared-files/_cni-popularity.md';

-| Provider | Project | Stars | Forks | Contributors |
-| ---- | ---- | ---- | ---- | ---- |
-| Canal | https://github.com/projectcalico/canal | 614 | 89 | 19 |
-| flannel | https://github.com/coreos/flannel | 4977 | 1.4k | 140 |
-| Calico | https://github.com/projectcalico/calico | 1534 | 429 | 135 |
-| Weave | https://github.com/weaveworks/weave/ | 5737 | 559 | 73 |
-
-<br/>
+<CNIPopularityTable />

 ### Which CNI Provider Should I Use?

@@ -1,5 +1,5 @@
 ---
-title: Vagrant Quick Start
+title: Rancher Vagrant Quick Start
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: 1. Enable Istio in the Cluster
+title: Enable Istio in the Cluster
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: 2. Enable Istio in a Namespace
+title: Enable Istio in a Namespace
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: 6. Generate and View Traffic
+title: Generate and View Traffic from Istio
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: 4. Set up the Istio Gateway
+title: Set up the Istio Gateway
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: 5. Set up Istio's Components for Traffic Management
+title: Set up Istio's Components for Traffic Management
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: 3. Add Deployments and Services with the Istio Sidecar
+title: Add Deployments and Services with the Istio Sidecar
 ---

 <head>
@@ -16,10 +16,7 @@ It is required to use the same hostname that was set as the server URL in the fi

 Rancher version must be v2.5.0 and up

-Rancher can be installed on any Kubernetes cluster, including hosted Kubernetes clusters such as Amazon EKS clusters. For help installing Kubernetes, refer to the documentation of the Kubernetes distribution. One of Rancher's Kubernetes distributions may also be used:
-
- [RKE Kubernetes installation docs](https://rancher.com/docs/rke/latest/en/installation/)
- [K3s Kubernetes installation docs](https://rancher.com/docs/k3s/latest/en/installation/)
+Rancher can be installed on any Kubernetes cluster, including hosted Kubernetes clusters such as Amazon EKS clusters. For help installing Kubernetes, refer to the documentation of the Kubernetes distribution. A Rancher-created Kubernetes distributions such as, but not limited to, [RKE](https://rke.docs.rancher.com/installation) or [K3s](https://docs.k3s.io/installation) may also be used.

 Since Rancher can be installed on any Kubernetes cluster, you can use this backup and restore method to migrate Rancher from one Kubernetes cluster to any other Kubernetes cluster. This method *only* migrates Rancher-related resources and won't affect other applications on the cluster. Refer to the [support matrix](https://www.suse.com/lifecycle/) to identify which Kubernetes cluster types and versions are supported for your Rancher version.

@@ -1,5 +1,5 @@
 ---
-title: Examples
+title: Backup and Restore Examples
 ---

 <head>
@@ -1,5 +1,5 @@
 ---
-title: Examples
+title: Monitoring V2 Configuration Examples
 ---

 <head>
@@ -8,20 +8,20 @@ title: Examples

 ### ServiceMonitor

-An example ServiceMonitor custom resource can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
+See the official prometheus-operator GitHub repo for an example [ServiceMonitor](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml) YAML.

 ### PodMonitor

-An example PodMonitor can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/user-guides/getting-started/example-app-pod-monitor.yaml) An example Prometheus resource that refers to it can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/user-guides/getting-started/prometheus-pod-monitor.yaml)
+See the [Prometheus Operator documentation](https://prometheus-operator.dev/docs/user-guides/getting-started/#using-podmonitors) for an example PodMonitor and an example Prometheus resource that refers to a PodMonitor.

 ### PrometheusRule

-For users who are familiar with Prometheus, a PrometheusRule contains the alerting and recording rules that you would normally place in a [Prometheus rule file](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/).
+A PrometheusRule contains the alerting and recording rules that you would usually place in a [Prometheus rule file](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/).

-For a more fine-grained application of PrometheusRules within your cluster, the ruleSelector field on a Prometheus resource allows you to select which PrometheusRules should be loaded onto Prometheus based on the labels attached to the PrometheusRules resources.
+For a more fine-grained approach, the `ruleSelector` field on a Prometheus resource can select which PrometheusRules should be loaded onto Prometheus, based on the labels attached to the PrometheusRules resources.

-An example PrometheusRule is on [this page.](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/alerting.md)
+See the [Prometheus Operator documentation](https://prometheus-operator.dev/docs/user-guides/alerting/) for an example PrometheusRule.

 ### Alertmanager Config

-For an example configuration, refer to [this section](./receivers.md#example-alertmanager-configs).
+See the Rancher docs page on Receivers for an example [Alertmanager config](./receivers.md#example-alertmanager-configs).