github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Add support for arm64 to the registry action of the kuberntes-worker juju charm.

Browse Source
This commit is contained in:
Rye Terrell 2018-05-07 09:12:16 -05:00
parent d4b4f5aa8d
commit 1f7d38a154
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/juju/layers/kubernetes-worker/actions/registry
View File

@ -25,7 +25,7 @@ from base64 import b64encode
from charmhelpers.core.hookenv import action_get from charmhelpers.core.hookenv import action_get
from charmhelpers.core.hookenv import action_set from charmhelpers.core.hookenv import action_set
from charms.templating.jinja2 import render 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') os.environ['PATH'] += os.pathsep + os.path.join(os.sep, 'snap', 'bin')
@ -33,6 +33,9 @@ deletion = action_get('delete')
context = {} 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 # These config options must be defined in the case of a creation
param_error = False param_error = False
for param in ('tlscert', 'tlskey', 'domain', 'htpasswd', 'htpasswd-plain'): for param in ('tlscert', 'tlskey', 'domain', 'htpasswd', 'htpasswd-plain'):

2
cluster/juju/layers/kubernetes-worker/templates/registry.yaml
View File

@ -37,7 +37,7 @@ spec:
spec: spec:
containers: containers:
- name: registry - name: registry
image: registry:2 image: cdkbot/registry-{{ arch }}:2.6
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits: