github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,890 Commits
33 Branches
860 Tags
624 MiB
Commit Graph

2 Commits (b4eca61aeb833724dd0bb277bff8982e7d9ee9b7)

Author SHA1 Message Date
Darren Shepherd 8f1a20c0d3 Add ability to append to slice during config file merge 
If key ends in "+" the value of the key is appended to previous
values found.  If values are string instead of a slice they are
automatically converted to a slice of one string.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2021-04-27 15:59:03 -07:00
Darren Shepherd a0a1071aa5
Support .d directory for k3s config file (#3162) 
Configuration will be loaded from config.yaml and then config.yaml.d/*.(yaml|yml) in
alphanumeric order.  The merging is done by just taking the last value of
a key found, so LIFO for keys.  Slices are not merged but replaced.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2021-04-15 11:29:24 -07:00