Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move prepare-fs script to scripts configmap #1070

Merged
merged 3 commits into from
Jun 14, 2019

Conversation

david-kow
Copy link
Contributor

Script gets generated early in Reconcile and put in scripts configMap. The script is effectively static, so linkedFiles reside now closer to the script generation instead of being passed down. Mount paths for data and logs volumes shared between init and ES containers were moved to settings to remove dependency on initcontainer and avoid circular dependency after moving linkedFiles to initcontainer.

Closes #932, before/after:

$ k describe pod | wc -l
387

$ k describe pod | wc -l
237

@david-kow david-kow force-pushed the move_scripts_to_configmap branch from a85f50b to 999ad1d Compare June 13, 2019 13:15
To copy plugin files between init and es volumes we iterated
PrepareFsSharedVolumes variable. Issue was that this variable
also included data and logs volumes which we don't need to copy
from. This commit introduces new variable for plugin volumes only
as PrepareFsSharedVolumes is used for other purposes too.
Copy link
Collaborator

@pebrc pebrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty good to me!

Copy link
Collaborator

@pebrc pebrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@david-kow david-kow merged commit 7657c30 into elastic:master Jun 14, 2019
@david-kow david-kow deleted the move_scripts_to_configmap branch June 14, 2019 14:58
@pebrc pebrc added >enhancement Enhancement of existing functionality v0.9.0 labels Jul 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement Enhancement of existing functionality v0.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Avoid inline scripts in container commands
2 participants