github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62071 from wwwtyro/rye/arm64-support

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-10 08:56:27 -07:00 committed by GitHub
commit 035679c3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/juju/layers/kubernetes-worker/metadata.yaml
View File

@ -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

6
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -722,6 +722,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"
@ -745,6 +748,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