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

Change charms to use juju-http{s}-proxy model settings #7

Merged
merged 15 commits into from
Jul 30, 2019

Conversation

VariableDeclared
Copy link
Contributor

Changed charm to use juju-http{s}-proxy-settings when these keys are defined.

LP#1831712

@VariableDeclared
Copy link
Contributor Author

VariableDeclared commented Jun 25, 2019

Pending Jenkins Tests
#8
#138

@VariableDeclared
Copy link
Contributor Author

Added Jenkins Tests; #447

@VariableDeclared VariableDeclared marked this pull request as ready for review July 3, 2019 07:39
Added code to pull down https_proxy config and override
any existing keys if they exist.
Added missing parenthesis which cause a crash at run-time.
Added proxy key configuration to override default
proxy options.

LP#:https://bugs.launchpad.net/charm-kubernetes-master/+bug/1831712
Added docs on how to update integration tests.
Removed comment block and change to exception
statement.
There is an issue where calling
config().update({val}) causes docker-relation-departed
to fail. Initial look into this does not reveal much.

But changing code to val = config() then updating does not
cause the issue.

Needs investigation, will write up notes.
reactive/docker.py Outdated Show resolved Hide resolved
@Cynerva
Copy link
Contributor

Cynerva commented Jul 12, 2019

Does this support CIDR notation in juju-no-proxy? From the Juju docs:

One big benefit of using these finely-scoped settings is that juju-no-proxy can contain subnets (in CIDR notation) whereas its legacy counterpart cannot.

Docker most likely does not understand CIDR notation in the NO_PROXY env var (most apps don't), meaning we'd have to expand it into individual IPs somewhere along the way. I'm looking at the definition of env_proxy_settings and it doesn't look like it expands them, so that leaves it as the responsibility of the caller to do so.

Moved juju configuration check into the container
runtime common layer.
@VariableDeclared
Copy link
Contributor Author

VariableDeclared commented Jul 16, 2019

Refactored and created another pull request on container-runtime-common

main logic is here

@VariableDeclared VariableDeclared changed the title Change charms to use juju-http{s}-proxy model settings WIP: Change charms to use juju-http{s}-proxy model settings Jul 17, 2019
Corrected missing config() call.
@VariableDeclared VariableDeclared changed the title WIP: Change charms to use juju-http{s}-proxy model settings Change charms to use juju-http{s}-proxy model settings Jul 17, 2019
Changed precedence so that local charm config
wins over juju-http-proxy config.
@VariableDeclared
Copy link
Contributor Author

Changing to WIP as I just need to run the most recent changes through.

@VariableDeclared VariableDeclared changed the title Change charms to use juju-http{s}-proxy model settings WIP Change charms to use juju-http{s}-proxy model settings Jul 17, 2019
@VariableDeclared VariableDeclared changed the title WIP Change charms to use juju-http{s}-proxy model settings WIP: Change charms to use juju-http{s}-proxy model settings Jul 17, 2019
@VariableDeclared VariableDeclared changed the title WIP: Change charms to use juju-http{s}-proxy model settings Change charms to use juju-http{s}-proxy model settings Jul 18, 2019
reactive/docker.py Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Added check for juju-http{s} proxy to install
method.
Missed the HTTP note. Updated this for changed
precedent.
@Cynerva
Copy link
Contributor

Cynerva commented Jul 29, 2019

Thanks, LGTM 👍

@Cynerva Cynerva merged commit 12aa66b into charmed-kubernetes:master Jul 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants