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
86bb1d74
Commit
86bb1d74
authored
Apr 03, 2018
by
Rye Terrell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for arm64 to juju charms.
parent
ca06cc43
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
metadata.yaml
cluster/juju/layers/kubernetes-worker/metadata.yaml
+4
-0
kubernetes_worker.py
...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+6
-0
No files found.
cluster/juju/layers/kubernetes-worker/metadata.yaml
View file @
86bb1d74
...
...
@@ -37,6 +37,10 @@ resources:
type
:
file
filename
:
cni.tgz
description
:
CNI plugins for amd64
cni-arm64
:
type
:
file
filename
:
cni.tgz
description
:
CNI plugins for arm64
cni-s390x
:
type
:
file
filename
:
cni.tgz
...
...
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @
86bb1d74
...
...
@@ -705,6 +705,9 @@ def launch_default_ingress_controller():
if
context
[
'arch'
]
==
's390x'
:
context
[
'defaultbackend_image'
]
=
\
"k8s.gcr.io/defaultbackend-s390x:1.4"
elif
context
[
'arch'
]
==
'arm64'
:
context
[
'defaultbackend_image'
]
=
\
"k8s.gcr.io/defaultbackend-arm64:1.4"
else
:
context
[
'defaultbackend_image'
]
=
\
"k8s.gcr.io/defaultbackend:1.4"
...
...
@@ -728,6 +731,9 @@ def launch_default_ingress_controller():
if
context
[
'arch'
]
==
's390x'
:
context
[
'ingress_image'
]
=
\
"docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
elif
context
[
'arch'
]
==
'arm64'
:
context
[
'ingress_image'
]
=
\
"gcr.io/google-containers/nginx-ingress-controller-arm64:0.9.0-beta.15"
# noqa
else
:
context
[
'ingress_image'
]
=
\
"k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.15"
# noqa
...
...
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