address comments

rancher · Oct 6, 2023 · 24bf90a · 24bf90a
1 parent 3d524e2
commit 24bf90a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git a/...cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md b/...cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
@@ -332,11 +332,11 @@ machineGlobalConfig:
         - key2=value2
 ```
 
-To ease the need to put files on nodes beforehand, Rancher expects the values of the following options to be the configuration's content,unlike K3s, where the values should be file paths:
+To make it easier to put files on nodes beforehand, Rancher expects the following values to be included in the configuration, while K3s expects the values to be entered as file paths:
 - private-registry
 - flannel-conf
 
-Rancher will deliver the files to target nodes, and set the proper options in the K3s Server. 
+Rancher delivers the files to target nodes, and sets the proper options in the K3s server.
 
 Example:
 ```yaml

diff --git a/...luster-configuration/rancher-server-configuration/rke2-cluster-configuration.md b/...luster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
@@ -362,12 +362,12 @@ machineGlobalConfig:
         - key2=value2
 ```
 
-To ease the need to put files on nodes beforehand, Rancher expects the values of the following options to be the configuration's content, unlike RKE2, where the values should be file paths:
+To make it easier to put files on nodes beforehand, Rancher expects the following values to be included in the configuration, while RKE2 expects the values to be entered as file paths:
 - audit-policy-file
 - cloud-provider-config
 - private-registry
 
-Rancher will deliver the files to target nodes, and set the proper options in the RKE2 Server.
+Rancher delivers the files to target nodes, and sets the proper options in the RKE2 server.
 
 Example:
 ```yaml
@@ -467,7 +467,7 @@ machineSelectorFiles:
 The secret or configmap must meet the following requirements:
 
 1. It must be in the `fleet-default` namespace where the Cluster object exists.
-2. It must have the annotation `rke.cattle.io/object-authorized-for-clusters: cluster-name1,cluster-name2`, which permits the target clusters to use it.  
+2. It must have the annotation `rke.cattle.io/object-authorized-for-clusters: cluster-name1,cluster-name2`, which permits the target clusters to use it.
 
 :::tip
 

diff --git a/...cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md b/...cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
@@ -318,6 +318,7 @@ chartValues:
     chart-name:
         key: value
 ```
+
 ### machineGlobalConfig
 
 Specify K3s configurations. Any configuration change made here will apply to every node. The configuration options available in the [standalone version of k3s](https://docs.k3s.io/cli/server) can be applied here.
@@ -331,11 +332,11 @@ machineGlobalConfig:
         - key2=value2
 ```
 
-To ease the need to put files on nodes beforehand, Rancher expects the values of the following options to be the configuration's content,unlike K3s, where the values should be file paths:
+To make it easier to put files on nodes beforehand, Rancher expects the following values to be included in the configuration, while K3s expects the values to be entered as file paths:
 - private-registry
 - flannel-conf
 
-Rancher will deliver the files to target nodes, and set the proper options in the K3s Server.
+Rancher delivers the files to target nodes, and sets the proper options in the K3s server.
 
 Example:
 ```yaml
@@ -379,6 +380,7 @@ machineSelectorConfig
         key1: value1
         key2: value2
 ```
+
 ### machineSelectorFiles
 
 :::note

diff --git a/...luster-configuration/rancher-server-configuration/rke2-cluster-configuration.md b/...luster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
@@ -362,6 +362,31 @@ machineGlobalConfig:
         - key2=value2
 ```
 
+To make it easier to put files on nodes beforehand, Rancher expects the following values to be included in the configuration, while RKE2 expects the values to be entered as file paths:
+- audit-policy-file
+- cloud-provider-config
+- private-registry
+
+Rancher delivers the files to target nodes, and sets the proper options in the RKE2 server.
+
+Example:
+```yaml
+apiVersion: provisioning.cattle.io/v1
+kind: Cluster
+spec:
+  rkeConfig:
+    machineGlobalConfig:
+      audit-policy-file: 
+        apiVersion: audit.k8s.io/v1 
+        kind: Policy 
+        rules: 
+        - level: RequestResponse
+          resources:
+          - group: ""
+            resources: 
+            - pods
+```
+
 ### machineSelectorConfig
 
 `machineSelectorConfig` is the same as [`machineGlobalConfig`](#machineglobalconfig) except that a [label](#kubernetes-node-labels) selector can be specified with the configuration. The configuration will only be applied to nodes that match the provided label selector.
@@ -386,31 +411,6 @@ machineSelectorConfig
         key2: value2
 ```
 
-To ease the need to put files on nodes beforehand, Rancher expects the values of the following options to be the configuration's content, unlike RKE2, where the values should be file paths:
-- audit-policy-file
-- cloud-provider-config
-- private-registry
-
-Rancher will deliver the files to target nodes, and set the proper options in the RKE2 Server.
-
-Example:
-```yaml
-apiVersion: provisioning.cattle.io/v1
-kind: Cluster
-spec:
-  rkeConfig:
-    machineGlobalConfig:
-      audit-policy-file: 
-        apiVersion: audit.k8s.io/v1 
-        kind: Policy 
-        rules: 
-        - level: RequestResponse
-          resources:
-          - group: ""
-            resources: 
-            - pods
-```
-
 ### machineSelectorFiles
 
 :::note