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.

Sign up for GitHub

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

Jump to bottom

Add support for proxy for Docker, curl, and apt-get #182

Merged
merged 2 commits into from
Feb 14, 2019
Merged

Add support for proxy for Docker, curl, and apt-get #182

merged 2 commits into from
Feb 14, 2019

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Jan 21, 2019 •
edited
Loading

What this PR does / why we need it:

  • Adds API fields for configuring HTTP_PROXY, HTTPS_PROXY, and NO_PROXY (see config.yaml.dist for usage)
  • Configure Docker daemon to use provided proxy configuration, as per Docker documentation

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes part of #88

Special notes for your reviewer:

  • This is not tested as I'm not sure which proxy to use. Creating systemd file works as expected
  • This uses same logic for Debian-based systems, CentOS and CoreOS, because all three use systemd. My assumption is that this should work, but I have not tested this. Should I test this before merging the PR?

Release note:

Added API fields for configuring HTTP_PROXY, HTTPS_PROXY and NO_PROXY. Configure proxy for Docker Daemon if proxy configuration is provided.

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 21, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Jan 21, 2019

/assign @kron4eg @alvaroaleman

@xmudrii xmudrii force-pushed the proxy branch 2 times, most recently from 573be2a to b9e50be Compare January 21, 2019 22:38
xmudrii
xmudrii commented Jan 21, 2019
View reviewed changes
Copy link
Member Author

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

Left some additional questions, please let me know what do you think :)

@xmudrii
Copy link
Member Author

xmudrii commented Jan 22, 2019

@alvaroaleman I pushed a commit to address comments, LMK is it okay

@kron4eg
Copy link
Member

kron4eg commented Feb 5, 2019

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c2691ce02500b6edb5564729dc13f4dde8e33a08

@kron4eg
Copy link
Member

kron4eg commented Feb 5, 2019

@alvaroaleman please approve this PR once you think it's done

@xmudrii
Copy link
Member Author

xmudrii commented Feb 5, 2019

/hold
I want to check does this works for newer Docker versions

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2019
@alvaroaleman
Copy link
Contributor

I belive we have a curl lingering around somewhere (for getting an apt key or something?), that one also needs the proxy settings. Other than that LGTM

@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 14, 2019
@xmudrii xmudrii changed the title Support configuring proxy for Docker daemon Configure proxy for Docker daemon and commands we run Feb 14, 2019
@xmudrii xmudrii changed the title Configure proxy for Docker daemon and commands we run Add support for proxy for Docker, curl, and apt-get Feb 14, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Feb 14, 2019

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 14, 2019
@xmudrii xmudrii force-pushed the proxy branch 4 times, most recently from f677a4a to 6aa6d0c Compare February 14, 2019 14:21
@xmudrii
Copy link
Member Author

xmudrii commented Feb 14, 2019

/hold
I have a typo

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 14, 2019
@kubermatic-bot kubermatic-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 14, 2019
@kron4eg
Copy link
Member

kron4eg commented Feb 14, 2019

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 14, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 0e5b067cbf0dabdaf8ac9810f5048b05645b28b9

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 14, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Feb 14, 2019

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 14, 2019
@kubermatic-bot kubermatic-bot merged commit 8ca334e into master Feb 14, 2019
@kubermatic-bot kubermatic-bot deleted the proxy branch February 14, 2019 15:33
This was referenced Feb 14, 2019
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kron4eg kron4eg kron4eg left review comments

@alvaroaleman alvaroaleman alvaroaleman left review comments

Assignees

@kron4eg kron4eg

@alvaroaleman alvaroaleman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xmudrii @kron4eg @kubermatic-bot @alvaroaleman