Skip to content

Commit 3791888

Browse files
authored
Merge pull request #1301 from srgvg/patch-1
Clarify precedence in Kustomization substituteFrom
2 parents 933ef1f + 53cca79 commit 3791888

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

docs/spec/v1/kustomizations.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,11 @@ stringData:
609609
token: ${token}
610610
```
611611

612-
The var values which are specified in-line with `substitute`
612+
**Note:** The var values which are specified in-line with `substitute`
613613
take precedence over the ones derived from `substituteFrom`.
614+
When var values for the same variable keys are derived from multiple
615+
`ConfigMaps` or `Secrets` referenced in the `substituteFrom` list, then the
616+
first take precedence over the later values.
614617

615618
**Note:** If you want to avoid var substitutions in scripts embedded in
616619
ConfigMaps or container commands, you must use the format `$var` instead of
@@ -1137,7 +1140,7 @@ This policy can be used for Kubernetes Jobs to rerun them when their container i
11371140
#### `kustomize.toolkit.fluxcd.io/prune`
11381141

11391142
When set to `Disabled`, this policy instructs the controller to skip the deletion of
1140-
the Kubernetes resources subject to [garbage collection](#prune).
1143+
the Kubernetes resources subject to [garbage collection](#prune).
11411144

11421145
This policy can be used to protect sensitive resources such as Namespaces, PVCs and PVs
11431146
from accidental deletion.

0 commit comments

Comments
 (0)