mirror of https://github.com/k3s-io/k3s
Merge pull request #62071 from wwwtyro/rye/arm64-support
Automatic merge from submit-queue (batch tested with PRs 60197, 61614, 62074, 62071, 62301). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add support for arm64 to juju charms. **What this PR does / why we need it**: Add support for arm64 to juju charms. **Release note**: ```release-note NONE ```pull/8/head
commit
035679c3c4
|
@ -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
|
||||
|
|
|
@ -722,6 +722,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"
|
||||
|
@ -745,6 +748,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
|
||||
|
|
Loading…
Reference in New Issue