Skip to content
This repository has been archived by the owner on Mar 4, 2024. It is now read-only.

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

Merged
merged 5 commits into from Aug 28, 2019

Conversation

Cynerva
Copy link
Contributor

@Cynerva Cynerva commented Aug 28, 2019

Fixes https://bugs.launchpad.net/layer-docker-registry/+bug/1832336

Built on the work of @VariableDeclared from #138 (thanks!).

I tested this by building the docker-registry charm with these changes. I deployed it and confirmed the following:

  1. When no charm or model proxy configs are set, the service file renders with no proxy.
  2. When charm proxy configs are set, they are included in the service file.
  3. When model proxy configs are set, they are included in the service file.
  4. When both charm and model proxy configs are set, the charm configs are used.
  5. juju-no-proxy CIDRs are expanded correctly before being rendered in the service file

Copy link
Contributor

@tvansteenburgh tvansteenburgh left a comment

Choose a reason for hiding this comment

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

Thanks for the thorough description of the testing you did.

@tvansteenburgh tvansteenburgh merged commit 764ed2a into master Aug 28, 2019
@Cynerva Cynerva deleted the gkk/lp-1831712 branch August 29, 2019 16:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants