[reloader] Add support for multiple config files #171
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wallyqs
reviewed
Apr 13, 2019
wallyqs
reviewed
Apr 13, 2019
|
Sent PR to the branch with a couple of fixes: https://github.com/schancel/nats-operator/compare/multi-reloader...wallyqs:multi-reloader?expand=1 |
schancel
commented
Apr 13, 2019
schancel
commented
Apr 13, 2019
cmd/reloader/main.go
Outdated
| fs.IntVar(&nconfig.MaxRetries, "max-retries", 5, "Max attempts to trigger reload") | ||
| fs.IntVar(&nconfig.RetryWaitSecs, "retry-wait-secs", 2, "Time to back off when reloading fails before retrying") | ||
|
|
||
| fs.Parse(os.Args[1:]) | ||
|
|
||
| nconfig.ConfigFiles = fileSet | ||
| if len(fileSet) == 0 { | ||
| nconfig.ConfigFiles = []string{"/etc/nats/gnatsd.conf"} |
There was a problem hiding this comment.
Do you want me to change this to /etc/nats-config/gnatsd.conf. I didn't want to change behavior, but I doubt anyone is using that? It's always set explicitly to the above by the operator it seems.
There was a problem hiding this comment.
sounds good to me to change to what actually is being used, thanks
wallyqs
approved these changes
Apr 13, 2019
There was a problem hiding this comment.
LGTM, would be great to update this test here too https://github.com/nats-io/nats-operator/blob/master/test/reloader/reloader_test.go
|
Can do tomorrow. |
Currently the config file expects there to only be one config file watched. However, the nats config file can include other paths, and we may also want to watch those. This commit implements being able to specify an arbtirary number of configuration files to be watched.
|
Pushed up a commit to figure out why e2e test blew up... :/ |
wallyqs
pushed a commit
to wallyqs/nats-operator
that referenced
this pull request
Apr 28, 2019
This commit adds support from reading the authorization section of the gnatsd config from a JSON file located within the nats-operator container. This allows secrets the data to be placed on disk using sidecars like consul-template. Depends on nats-io#171
wallyqs
pushed a commit
to wallyqs/nats-operator
that referenced
this pull request
Apr 29, 2019
This commit adds support from reading the authorization section of the gnatsd config from a JSON file located within the nats-operator container. This allows secrets the data to be placed on disk using sidecars like consul-template. Depends on nats-io#171
pires
pushed a commit
that referenced
this pull request
Apr 29, 2019
* Enable specifing a `ClientsAuthFile` for user authorization data This commit adds support from reading the authorization section of the gnatsd config from a JSON file located within the nats-operator container. This allows secrets the data to be placed on disk using sidecars like consul-template. Depends on #171 * Fixes to support auth file include Signed-off-by: Waldemar Quevedo <[email protected]> * Update images used by upgrade test Signed-off-by: Waldemar Quevedo <[email protected]> * Increase timeout of test to 20m Signed-off-by: Waldemar Quevedo <[email protected]> * Update reloader test Signed-off-by: Waldemar Quevedo <[email protected]> * Update manifest example for auth file Signed-off-by: Waldemar Quevedo <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the config file expects there to only be one config file
watched. However, the nats config file can include other paths, and
we may also want to watch those.
This commit implements being able to specify an arbtirary number of
configuration files to be watched.