[release-1.29] Fix issues loading data-dir value from env vars or dropin config files #10597
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.
Backport of #10591
Proposed Changes
This was only used to pass the bundled strongswan path through to the flannel ipsec backend, and is no longer needed. Ref: Initial encrypted network support #719
configfilearg.FindString
would silently skip parsing dropins if the main config file didn't exist. If a custom config file path was passed it would raise an error, but if we were parsing the default config file and it didn't exist it would just silently fail to load the dropins.Types of Changes
bugfix
Verification
Includes tests
Testing
See linked issue
Linked Issues
data-dir
set via config file drop-in, or via env var #10593User-Facing Change
Further Comments