markups done

ios-xr · Jun 3, 2024 · f2d199d · f2d199d
1 parent 47a962c
commit f2d199d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/charts/xrd-vrouter/templates/statefulset.yaml b/charts/xrd-vrouter/templates/statefulset.yaml
@@ -57,17 +57,17 @@ Construct the resources including the default if that resource wasn't specified.
 {{- if .Values.cpu }}
   {{- with .Values.cpu}}
     {{- if and .controlPlaneCpuset (not .dataPlaneCpuset)}}
-      {{- fail "controlPlaneCpuset is set but dataPlaneCpuset is not set" }}
+      {{- fail "dataPlaneCpuset must be set if controlPlaneCpuset is set" }}
     {{- end }}
     {{- if and .dataPlaneCpuset (not .controlPlaneCpuset)}}
-      {{- fail "dataPlaneCpuset is set but controlPlaneCpuset is not set" }}
+      {{- fail "controlPlaneCpuset must be set if dataPlaneCpuset is set" }}
     {{- end }}
     {{- if and .controlPlaneCpuset .dataPlaneCpuset}}
       {{- if .cpuset }}
-        {{- fail "cpuset is set but controlPlaneCpuset and dataPlaneCpuset are also set" }}
+        {{- fail "cpuset must not be set if controlPlaneCpuset and dataPlaneCpuset are set" }}
       {{- end }}
       {{- if .controlPlaneCpuCount }}
-        {{- fail "controlPlaneCpuCount is set but controlPlaneCpuset and dataPlaneCpuset are also set" }}
+        {{- fail "controlPlaneCpuCount must not be set if controlPlaneCpuset and dataPlaneCpuset are set" }}
       {{- end }}
       {{- $_ := set $env "XR_VROUTER_DP_CPUSET" .dataPlaneCpuset }}
       {{- $_ := set $env "XR_VROUTER_CP_CPUSET" .controlPlaneCpuset }}

diff --git a/charts/xrd-vrouter/values.schema.json b/charts/xrd-vrouter/values.schema.json
@@ -334,11 +334,11 @@
       "type": "object",
       "properties": {
         "controlPlaneCpuset": {
-          "description": "CPUset for the XRd control plane to use",
+          "description": "cpuset for the XRd control-plane to use",
           "type": "string"
         },
         "dataPlaneCpuset": {
-          "description": "CPUset for the XRd data plane to use",
+          "description": "cpuset for the XRd dataplane to use",
           "type": "string"
         },
         "cpuset": {

diff --git a/charts/xrd-vrouter/values.yaml b/charts/xrd-vrouter/values.yaml
@@ -236,12 +236,12 @@ mgmtInterfaces: []
 #    - "10.0.0.1/24"
 
 # CPU settings.
-# More information about the CPU behavior of XRd vRouter can be found
-# here: @@@
 cpu: {}
-  # Specify the cpusets for XRd to use for the control plane and the data
-  # plane. They must each be a subset of the CPUs available for XRd to run on.
+  # Specify the cpusets for XRd to use for the control-plane and the dataplane.
+  # They must each be a subset of the CPUs available for XRd to run on.
   # Both or neither must be specified.
+  # If neither is specified then all available CPUs are used, split
+  # appropriately between the control-plane and dataplane.
   #controlPlaneCpuset: ""
   #dataPlaneCpuset: ""
   # HyperThreading mode.
@@ -259,11 +259,14 @@ cpu: {}
   # Deprecated cpu settings:
   #
   # Override the cpuset to use for XRd. Must not be used in conjunction with
-  # controlPlaneCpuset and dataPlaneCpuset. (Deprecated.)
+  # controlPlaneCpuset and dataPlaneCpuset.
+  # Deprecated. Use controlPlaneCpuset and dataPlaneCpuset instead.
   # This must be a subset of the CPUs available for XRd to run on.
   #cpuset: ""
   # Override the number of CPUs used for control-plane threads from the pool of
-  # CPUs in the XRd cpuset, used in conjunction with cpuset. (Deprecated.)
+  # CPUs in the XRd cpuset. Must not be used in conjunction with
+  # controlPlaneCpuset and dataPlaneCpuset.
+  # Deprecated. Use controlPlaneCpuset and dataPlaneCpuset instead.
   #controlPlaneCpuCount: 2
 
 # PCI interface driver.