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

Vagrant: Add support for .devvmrc #14272

Merged
merged 1 commit into from
Dec 10, 2020
Merged

Conversation

jrajahalme
Copy link
Member

Execute the file .devvmrc within the Developer VM and CI VMs, if it
exists in the cilium repo. This allows for setting git config, docker
registry caching, or any other personal settings for the Dev's environment
automatically.

Setting up /etc/hosts in k8s_install.sh is changed to append instead
of replace, so that .devvmrc can add host entries without losing them
right after when k8s_install runs.

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

@jrajahalme jrajahalme added kind/enhancement This would improve or streamline existing functionality. release-note/misc This PR makes changes that have no direct user impact. labels Dec 4, 2020
@jrajahalme jrajahalme requested review from a team as code owners December 4, 2020 09:28
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Dec 4, 2020
@jrajahalme
Copy link
Member Author

test-me-please

@jrajahalme
Copy link
Member Author

test-me-please

test/Vagrantfile Outdated
# Disable unattended-upgrades to prevent it from holding the dpkg frontend lock
# To be removed once this has been added through packer-ci-build
sudo systemctl disable unattended-upgrades.service
sudo systemctl stop unattended-upgrades.service
Copy link
Member

Choose a reason for hiding this comment

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

We can now remove those lines, they are part of the VM images: cilium/packer-ci-build@af99f4c.

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed, thanks!

Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

Nice. It would be good to update the contributing docs to mention this file for users who first setting up their environment.

Execute the file .devvmrc within the Developer VM and CI VMs, if it
exists in the cilium repo. This allows for setting git config, docker
registry caching, or any other personal settings for the Dev's environment
automatically.

Setting up /etc/hosts in k8s_install.sh is changed to append instead
of replace, so that .devvmrc can add host entries without losing them
right after when k8s_install runs.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme
Copy link
Member Author

@christarazi Added docs :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement This would improve or streamline existing functionality. 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