Skip to content

Commit b4d23e7

Browse files
authored
Merge pull request #1487 from fluxcd/fix-substitute-doc
docs: Clarify `substituteFrom` overwrite order
2 parents ba3c16a + 2fb1fa3 commit b4d23e7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

docs/spec/v1/kustomizations.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ spec:
699699
# Fail if this Secret does not exist.
700700
```
701701

702-
**Note:** For substituting variables in a secret, `.spec.stringData` field must be used i.e:
702+
For substituting variables in a secret, `.spec.stringData` field must be used i.e:
703703

704704
```yaml
705705
---
@@ -713,11 +713,11 @@ stringData:
713713
token: ${token}
714714
```
715715

716-
**Note:** The var values which are specified in-line with `substitute`
716+
The var values which are specified in-line with `substitute`
717717
take precedence over the ones derived from `substituteFrom`.
718718
When var values for the same variable keys are derived from multiple
719-
`ConfigMaps` or `Secrets` referenced in the `substituteFrom` list, then the
720-
first take precedence over the later values.
719+
`ConfigMaps` or `Secrets` referenced in the `substituteFrom` list,
720+
the later values overwrite earlier values.
721721

722722
**Note:** If you want to avoid var substitutions in scripts embedded in
723723
ConfigMaps or container commands, you must use the format `$var` instead of

0 commit comments

Comments
 (0)