Support mlock and custom tmpdir for containerized plugins #23215
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
github-actions
bot
added
the
hashicorp-contributed-pr
|
Build Results: |
|
CI Results: |
tomhjp
commented
Sep 21, 2023
| @@ -139,7 +143,8 @@ func (rc runConfig) makeConfig(ctx context.Context) (*plugin.ClientConfig, error | |||
| clientConfig.SkipHostEnv = true | |||
| clientConfig.RunnerFunc = containerCfg.NewContainerRunner | |||
| clientConfig.UnixSocketConfig = &plugin.UnixSocketConfig{ | |||
| Group: strconv.Itoa(containerCfg.GroupAdd), | |||
| Group: strconv.Itoa(containerCfg.GroupAdd), | |||
| TempDir: os.Getenv("VAULT_PLUGIN_TMPDIR"), | |||
There was a problem hiding this comment.
Maybe this should be settable with both an env var and a config file option?
There was a problem hiding this comment.
It would be nice, but not strictly necessary I think.
There was a problem hiding this comment.
👍 I think I'll aim to add a config option for 1.15.1 given where we are in the release cycle.
|
Note: I'm planning to merge the library PRs and tag them once all 3 have been reviewed, so once this PR is stable there will be a couple of go.mod changes to use tagged versions of the deps. |
swenson
approved these changes
Sep 21, 2023
| @@ -139,7 +143,8 @@ func (rc runConfig) makeConfig(ctx context.Context) (*plugin.ClientConfig, error | |||
| clientConfig.SkipHostEnv = true | |||
| clientConfig.RunnerFunc = containerCfg.NewContainerRunner | |||
| clientConfig.UnixSocketConfig = &plugin.UnixSocketConfig{ | |||
| Group: strconv.Itoa(containerCfg.GroupAdd), | |||
| Group: strconv.Itoa(containerCfg.GroupAdd), | |||
| TempDir: os.Getenv("VAULT_PLUGIN_TMPDIR"), | |||
There was a problem hiding this comment.
It would be nice, but not strictly necessary I think.
…ock-and-custom-tmpdir
|
Thanks! |
tomhjp
deleted the
vault-18185/containerized-plugins-support-mlock-and-custom-tmpdir
branch
tomhjp
added a commit
that referenced
this pull request
Sep 22, 2023
tomhjp
added a commit
that referenced
this pull request
Sep 22, 2023
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.
When running containerised plugins within the context of our default systemd unit file (from the rpm repositories), I found a couple of issues I hadn't stumbled on previously:
/tmp, so we need the ability to negotiate a separate directory that both sides can see. We could just use TMPDIR, but then that ruins the whole point of the setting. Instead, we introduce a new environment variable to use a different tmp dir in one very narrow use-case. Library PR: Add TempDir option to UnixSocketConfig go-plugin#282