From 1f7d38a154c2a9fc3da8932c4585ec1e97e05cc1 Mon Sep 17 00:00:00 2001 From: Rye Terrell Date: Mon, 7 May 2018 09:12:16 -0500 Subject: [PATCH] Add support for arm64 to the registry action of the kuberntes-worker juju charm. --- cluster/juju/layers/kubernetes-worker/actions/registry | 5 ++++- .../juju/layers/kubernetes-worker/templates/registry.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/actions/registry b/cluster/juju/layers/kubernetes-worker/actions/registry index 7a0ee150abd..81c8bc03809 100755 --- 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'): diff --git a/cluster/juju/layers/kubernetes-worker/templates/registry.yaml b/cluster/juju/layers/kubernetes-worker/templates/registry.yaml index d24b713ce7f..2503f3abfb2 100644 --- 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: