Update the way to add settings in the ES keystore #1377
Merged
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
This fixes an issue where the repository-gcs plugin fails if the setting gcs.client.default.credentials_file is not a compacted JSON and is added using `elasticsearch-keystore add key --stdin`.
|
✔️ --- PASS: TestUpdateESSecureSettings (597.24s) |
|
Jenkins test this please |
sebgl
approved these changes
Jul 25, 2019
| @@ -46,7 +46,7 @@ import ( | |||
| // initContainerParams is used to generate the init container that will load the secure settings into a keystore | |||
| var initContainerParams = keystore.InitContainerParameters{ | |||
| KeystoreCreateCommand: "/usr/share/elasticsearch/bin/elasticsearch-keystore create", | |||
| KeystoreAddCommand: "/usr/share/elasticsearch/bin/elasticsearch-keystore add", | |||
| KeystoreAddCommand: "/usr/share/elasticsearch/bin/elasticsearch-keystore add-file", | |||
There was a problem hiding this comment.
Maybe KeystoreAddFileCommand for explicitness?
There was a problem hiding this comment.
InitContainerParameters is used between ES, Kibana and APM Server, so we have to stay a bit abstract.
|
Do we want to include this in 0.9? (My take: yes.) |
|
Agreed. We should backport it |
thbkrkr
added a commit
to thbkrkr/cloud-on-k8s
that referenced
this pull request
Jul 25, 2019
This fixes an issue where the repository-gcs plugin fails if the setting gcs.client.default.credentials_file is not a compacted JSON and is added using `elasticsearch-keystore add key --stdin`. Since the secure settings are now in a Secret and each key of a Secret is mounted in a container as files I think we can safely change the way elasticsearch-keystore is called to add settings.
thbkrkr
added a commit
that referenced
this pull request
Jul 25, 2019
This fixes an issue where the repository-gcs plugin fails if the setting gcs.client.default.credentials_file is not a compacted JSON and is added using `elasticsearch-keystore add key --stdin`. Since the secure settings are now in a Secret and each key of a Secret is mounted in a container as files I think we can safely change the way elasticsearch-keystore is called to add settings.
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.
This fixes an issue where the
repository-gcsplugin fails if thesetting
gcs.client.default.credentials_fileis not a compacted JSONand is added using
elasticsearch-keystore add key --stdin.Since the secure settings are now in a Secret and each key of a Secret is mounted in a container as files I think we can safely change the way
elasticsearch-keystoreis called to add settings.Fixes #1349.