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

Vagrantfile: Add support for SHARE_PARENT=2 #14559

Merged
merged 1 commit into from
Jan 11, 2021

Conversation

jrajahalme
Copy link
Member

Add support for value "2" for "SHARE_PARENT" environment variable,
which causes the parent of the parent of the current directory to be
shared with the Dev VM. This is useful to share all the github.com
repositories in the developer's directory tree with the dev VM without
using "USER_MOUNTS".

This also fixes the NFS mount error on macOS when one exported NFS
directory is within another. This would happen if the cilium repo is
in the same tree that would be shared with USER_MOUNTS.

Signed-off-by: Jarno Rajahalme jarno@covalent.io

Add support for value "2" for "SHARE_PARENT" environment variable,
which causes the parent of the parent of the current directory to be
shared with the Dev VM. This is useful to share all the github.com
repositories in the developer's directory tree with the dev VM without
using "USER_MOUNTS".

This also fixes the NFS mount error on macOS when one exported NFS
directory is within another. This would happen if the cilium repo is
in the same tree that would be shared with USER_MOUNTS.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme added area/CI Continuous Integration testing issue or flake release-note/misc This PR makes changes that have no direct user impact. labels Jan 8, 2021
@jrajahalme jrajahalme requested review from a team as code owners January 8, 2021 09:48
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Jan 8, 2021
@jrajahalme
Copy link
Member Author

test-me-please

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

One nit, LGTM otherwise!

if ENV["SHARE_PARENT"] == "2" then
cilium_dir = '../..'
cilium_path = '/home/vagrant/go/src/github.com'
elsif ENV["SHARE_PARENT"] then
Copy link
Member

Choose a reason for hiding this comment

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

Might be worth checking for == "1" here, in case some contributors see the SHARE_PARENT=2 and try to disable by explicitely passing SHARE_PARENT=0.

@pchaigno pchaigno removed their assignment Jan 8, 2021
@jrajahalme
Copy link
Member Author

retest-gke

1 similar comment
@jrajahalme
Copy link
Member Author

retest-gke

@pchaigno
Copy link
Member

pchaigno commented Jan 8, 2021

We don't use the Vagrantfiles for GKE, so I don't think we need to wait for that CI pipeline. Marking as ready to merge.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 8, 2021
@aditighag aditighag merged commit 430dad8 into master Jan 11, 2021
@aditighag aditighag deleted the pr/jrajahalme/vagrant-share-parent-2 branch January 11, 2021 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants