add support for non-amd64 arch gcr.io images #2104
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
|
ci check this |
|
This is very interesting. Thx for the PR. I was just thinking about ARM devices the other day! Looks like yamllint failed. If you'll get it fixed up, I'll re-kick CI. |
xd007
force-pushed
the
multi-arch-support
branch
from
5012c8e
to
950373e
Compare
xd007
force-pushed
the
multi-arch-support
branch
from
950373e
to
66020ed
Compare
xd007
force-pushed
the
multi-arch-support
branch
from
66020ed
to
5d6f66b
Compare
mattymo
reviewed
Apr 25, 2018
roles/dnsmasq/defaults/main.yml
Outdated
| @@ -33,3 +33,6 @@ dnsmasq_min_replicas: 1 | |||
|
|
|||
| # Custom name servers | |||
| dnsmasq_upstream_dns_servers: [] | |||
|
|
|||
| # Arch of Docker images and needed packages | |||
| image_arch: "{{ image_arch | default('amd64') }}" | |||
There was a problem hiding this comment.
This is not how defaults works. Just put it like this:
# Arch of Docker images and needed packages
image_arch: amd64
There's no need to quote if it starts with a letter.
mattymo
reviewed
Apr 25, 2018
| @@ -23,6 +23,9 @@ download_always_pull: False | |||
| # Use the first kube-master if download_localhost is not set | |||
| download_delegate: "{% if download_localhost %}localhost{% else %}{{groups['kube-master'][0]}}{% endif %}" | |||
|
|
|||
| # Arch of Docker images and needed packages | |||
There was a problem hiding this comment.
This is not how defaults works. Just put it like this:
# Arch of Docker images and needed packages
image_arch: amd64
There's no need to quote if it starts with a letter.
mattymo
reviewed
Apr 25, 2018
roles/vault/defaults/main.yml
Outdated
| @@ -18,12 +18,15 @@ vault_roles_dir: "{{ vault_base_dir }}/roles" | |||
| vault_secrets_dir: "{{ vault_base_dir }}/secrets" | |||
| vault_log_dir: "/var/log/vault" | |||
|
|
|||
| # Arch of Docker images and needed packages | |||
| image_arch: "{{ image_arch | default('amd64') }}" | |||
There was a problem hiding this comment.
This is not how defaults works. Just put it like this:
# Arch of Docker images and needed packages
image_arch: amd64
```
There's no need to quote if it starts with a letter.
Currently all the gcr.io images used in kubespray can only run on x86. Also gcr.io has not fully support multi-arch docker images. Add extra var "image_arch" (default is amd64) to support running other platforms, like arm64. Change-Id: I8e1c9af533c021cb96ade291a1ce58773b40e271
|
@mattymo Updated. PTAL. Thanks. |
ant31
approved these changes
Aug 17, 2018
|
@xd007 Thank you ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently all the gcr.io images used in kubespray can only run on x86.
Also gcr.io has not fully support multi-arch docker images.
Add extra var "image_arch" (default is amd64) to support running other
platforms, like arm64.
Change-Id: I8e1c9af533c021cb96ade291a1ce58773b40e271