Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1f7d38a1
Commit
1f7d38a1
authored
May 07, 2018
by
Rye Terrell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for arm64 to the registry action of the kuberntes-worker juju charm.
parent
d4b4f5aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
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.
cluster/juju/layers/kubernetes-worker/actions/registry
View file @
1f7d38a1
...
...
@@ -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'
):
...
...
cluster/juju/layers/kubernetes-worker/templates/registry.yaml
View file @
1f7d38a1
...
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment