github/k3s - k3s - https://git.xinac.net

Commit Graph

Author	SHA1	Message	Date
Derek Nola	e1d4cff14c	Enable FindString to search dotD config files (#7323 ) * Enable FindString to search dotD config files * Address multiple arg cases Signed-off-by: Derek Nola <derek.nola@suse.com>	2 years ago
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>	4 years ago
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>	4 years ago

Author

SHA1

Message

Date

Derek Nola

e1d4cff14c

Enable FindString to search dotD config files (#7323 )

* Enable FindString to search dotD config files
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>

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>

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>

3 Commits (5170bc5a04bd33235f7ada66ec3e900ef8cfa788)