Merge pull request #45550 from jacekn/fix45547

Automatic merge from submit-queue (batch tested with PRs 45569, 45602, 45604, 45478, 45550) Don't append :443 to registry domain in the kubernetes-worker layer registry action **What this PR does / why we need it**: Fixes #45547 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #45547 **Special notes for your reviewer**: **Release note**: ``` Fix #45547 - don't append :443 to juju created docker registry config ```

Merge pull request #45550 from jacekn/fix45547
4b2ab4e1 · Kubernetes Submit Queue · GitHub · fc7ae993 · b61fd20c · 4b2ab4e1
Commit 4b2ab4e1 authored May 10, 2017 by Kubernetes Submit Queue Committed by GitHub May 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

registry cluster/juju/layers/kubernetes-worker/actions/registry +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-worker/actions/registry
+++ b/cluster/juju/layers/kubernetes-worker/actions/registry
@@ -46,7 +46,7 @@ for param in ('tlscert', 'tlskey', 'domain', 'htpasswd', 'htpasswd-plain'):
    context[param] = value

 # Create the dockercfg template variable
-dockercfg = '{"%s:443": {"auth": "%s", "email": "root@localhost"}}' % \
+dockercfg = '{"%s": {"auth": "%s", "email": "root@localhost"}}' % \
            (context['domain'], context['htpasswd-plain'])
 context['dockercfg'] = b64encode(dockercfg.encode()).decode('ASCII')