Skip to content

Commit 8f8e78d

Browse files
committed
Reword merge mechanism
1 parent 387268d commit 8f8e78d

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

modules/concepts/pages/overrides.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,11 @@ This is often needed to e.g. configure a HTTP proxy or other network settings.
160160
As with other overrides, the operator generates a set of JVM arguments that are needed to run the tool. You can specify additional arguments which are merged on top of the ones the operator generated.
161161
As some JVM arguments are mutually exclusive (think of `-Xmx123m` and `-Xmx456m`), you also have the option to remove JVM arguments - either by specifying the exact argument or a regex.
162162

163-
The merging mechanism is applied <operator-generated> <- <role user specified> <- <rolegroup user specified> and works as follows:
163+
The merging mechanism is applied <operator generated> <- <role user specified> <- <rolegroup user specified> and works as follows:
164164

165-
Let user be the user-specified arguments and operator be the arguments generated by the operator.
166-
167-
1. All arguments listed in user `remove` are removed from operator
168-
2. All arguments matching any regex from user `removeRegex` are removed from operator
169-
3. All arguments from user `add` are added to operator
165+
1. All arguments listed in user specified `remove` are removed from operator generated
166+
2. All arguments matching any regex from user `removeRegex` are removed from operator generated
167+
3. All arguments from user specified `add` are added to operator
170168
171169
You can check the resulting effective JVM arguments by looking at the ConfigMap containing the config for the roleGroup (although some tools read the JVM arguments from environmental variables).
172170

0 commit comments

Comments
 (0)