Merge branch 'main' into remove-references-to-deprecated-resourceset

docs/api/api-reference.mdx

@@ -15,4 +15,4 @@ At this time, not all Rancher resources are available through the Rancher Kubern
 
 import ApiDocMdx from '@theme/ApiDocMdx';
 
-<ApiDocMdx id="rancher-api" />
+<ApiDocMdx id="rancher-api-v2-11" />

docs/how-to-guides/advanced-user-guides/enable-experimental-features/cluster-role-aggregation.md

@@ -7,7 +7,7 @@ title: ClusterRole Aggregation
 </head>
 
 :::caution
-ClusterRole aggregation is a highly experimental feature that changes the RBAC architecture used for RoleTemplates, ClusterRoleTemplateBindings and ProjectRoleTemplateBindings. **It is not supported for production environments**. This feature is meant exclusively for internal testing in v2.11. It is expected to be available as a beta for users in v2.12 with a prospective GA in Rancher v2.13.
+ClusterRole aggregation is a highly experimental feature that changes the RBAC architecture used for RoleTemplates, ClusterRoleTemplateBindings and ProjectRoleTemplateBindings. **It is not supported for production environments**. This feature is meant exclusively for internal testing in v2.11 and v2.12. It is expected to be available as a beta for users in v2.13.
 :::
 
 ClusterRole aggregation implements RoleTemplates, ClusterRoleTemplateBindings and ProjectRoleTemplateBindings using the Kubernetes feature [Aggregated ClusterRoles](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles). The new architecture results in a net reduction in RBAC objects (Roles, RoleBindings, ClusterRoles and ClusterRoleBindings) both in the Rancher cluster and the downstream clusters.

docs/integrations-in-rancher/logging/logging.md

@@ -55,6 +55,37 @@ For help with configuring `Flows` and `ClusterFlows`, see [this page.](custom-re
 
 For help with configuring `Outputs` and `ClusterOutputs`, see [this page.](custom-resource-configuration/outputs-and-clusteroutputs.md)
 
+## Using a custom HostTailer image
+
+To use a custom image for the `HostTailer` resource, you need to specify the image in the `containerOverrides` section of each `fileTailer` of the `HostTailer` resource.
+
+```yaml
+apiVersion: logging-extensions.banzaicloud.io/v1alpha1
+kind: HostTailer
+metadata:
+  name: cluster-system-log
+spec:
+  workloadMetaOverrides:
+    annotations: {}
+    labels: {}
+  fileTailers:
+    - disabled: false
+      name: kubelet-log
+      path: /var/lib/rancher/rke2/agent/logs/*.log
+      containerOverrides:
+        image: <your_registry>/<your_image>:<your_tag>
+    - disabled: false
+      name: containerd-log
+      path: /var/lib/rancher/rke2/agent/containerd/*.log
+      containerOverrides:
+        image: <your_registry>/<your_image>:<your_tag>
+    - name: kube-audit
+      path: /var/log/kube-audit/audit-log.json
+      disabled: false
+      containerOverrides:
+        image: <your_registry>/<your_image>:<your_tag>
+```
+
 ## Configuring the Logging Helm Chart
 
 For a list of options that can be configured when the logging application is installed or upgraded, see [this page.](logging-helm-chart-options.md)