Merge pull request #63488 from wwwtyro/rye/arm64-registry

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add support for arm64 to the registry action of the kuberntes-worker juju charm. **What this PR does / why we need it**: Add support for arm64 to the registry action of the kuberntes-worker juju charm. **Release note**: ```release-note NONE ```

Merge pull request #63488 from wwwtyro/rye/arm64-registry
e76c6227 · Kubernetes Submit Queue · GitHub · d7d43819 · 1f7d38a1 · e76c6227
Unverified Commit e76c6227 authored May 07, 2018 by Kubernetes Submit Queue Committed by GitHub May 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

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

registry.yaml ...ter/juju/layers/kubernetes-worker/templates/registry.yaml +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-worker/actions/registry
+++ b/cluster/juju/layers/kubernetes-worker/actions/registry
@@ -25,7 +25,7 @@ from base64 import b64encode
 from charmhelpers.core.hookenv import action_get
 from charmhelpers.core.hookenv import action_set
 from charms.templating.jinja2 import render
-from subprocess import call
+from subprocess import call, check_output

 os.environ['PATH'] += os.pathsep + os.path.join(os.sep, 'snap', 'bin')

@@ -33,6 +33,9 @@ deletion = action_get('delete')

 context = {}

+arch = check_output(['dpkg', '--print-architecture']).rstrip()
+context['arch'] = arch.decode('utf-8')
+
 # These config options must be defined in the case of a creation
 param_error = False
 for param in ('tlscert', 'tlskey', 'domain', 'htpasswd', 'htpasswd-plain'):

--- a/cluster/juju/layers/kubernetes-worker/templates/registry.yaml
+++ b/cluster/juju/layers/kubernetes-worker/templates/registry.yaml
@@ -37,7 +37,7 @@ spec:
    spec:
      containers:
      - name: registry
-        image: registry:2
+        image: cdkbot/registry-{{ arch }}:2.6
        resources:
          # keep request = limit to keep this container in guaranteed class
          limits: