Commit 86bb1d74 authored by Rye Terrell's avatar Rye Terrell

Add support for arm64 to juju charms.

parent ca06cc43
...@@ -37,6 +37,10 @@ resources: ...@@ -37,6 +37,10 @@ resources:
type: file type: file
filename: cni.tgz filename: cni.tgz
description: CNI plugins for amd64 description: CNI plugins for amd64
cni-arm64:
type: file
filename: cni.tgz
description: CNI plugins for arm64
cni-s390x: cni-s390x:
type: file type: file
filename: cni.tgz filename: cni.tgz
......
...@@ -705,6 +705,9 @@ def launch_default_ingress_controller(): ...@@ -705,6 +705,9 @@ def launch_default_ingress_controller():
if context['arch'] == 's390x': if context['arch'] == 's390x':
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"k8s.gcr.io/defaultbackend-s390x:1.4" "k8s.gcr.io/defaultbackend-s390x:1.4"
elif context['arch'] == 'arm64':
context['defaultbackend_image'] = \
"k8s.gcr.io/defaultbackend-arm64:1.4"
else: else:
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"k8s.gcr.io/defaultbackend:1.4" "k8s.gcr.io/defaultbackend:1.4"
...@@ -728,6 +731,9 @@ def launch_default_ingress_controller(): ...@@ -728,6 +731,9 @@ def launch_default_ingress_controller():
if context['arch'] == 's390x': if context['arch'] == 's390x':
context['ingress_image'] = \ context['ingress_image'] = \
"docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13" "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: else:
context['ingress_image'] = \ context['ingress_image'] = \
"k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.15" # noqa "k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.15" # noqa
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment