Browse Source

etcd arch-image

pull/3140/head
Antoine Legrand 6 years ago
parent
commit
247b9e83d8
3 changed files with 16 additions and 6 deletions
  1. 4
      roles/download/defaults/main.yml
  2. 4
      roles/download/tasks/main.yml
  3. 14
      roles/kubernetes/preinstall/tasks/0040-set_facts.yml

4
roles/download/defaults/main.yml

@ -27,7 +27,7 @@ download_always_pull: False
download_delegate: "{% if download_localhost %}localhost{% else %}{{groups['kube-master'][0]}}{% endif %}"
# Arch of Docker images and needed packages
image_arch: amd64
image_arch: "{{host_architecture | default('amd64')}}"
# Versions
kube_version: v1.11.2
@ -62,7 +62,7 @@ vault_binary_checksum: 3c4d70ba71619a43229e65c67830e30e050eab7a81ac6b28325ff707e
# Containers
etcd_image_repo: "quay.io/coreos/etcd"
etcd_image_tag: "{{ etcd_version }}"
etcd_image_tag: "{{ etcd_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}"
flannel_image_repo: "quay.io/coreos/flannel"
flannel_image_tag: "{{ flannel_version }}"
flannel_cni_image_repo: "quay.io/coreos/flannel-cni"

4
roles/download/tasks/main.yml

@ -1,8 +1,4 @@
---
- include_tasks: download_prep.yml
when:
- not skip_downloads|default(false)
- name: "Download items"
include_tasks: "download_{% if download.container %}container{% else %}file{% endif %}.yml"
vars:

14
roles/kubernetes/preinstall/tasks/0040-set_facts.yml

@ -1,4 +1,18 @@
---
- set_fact:
architecture_groups:
x86_64: amd64
aarch64: arm64
- name: ansible_architecture_rename
set_fact:
host_architecture: >-
{%- if ansible_architecture in architecture_groups -%}
{{architecture_groups[ansible_architecture]}}
{%- else -%}
{{ansible_architecture}}
{% endif %}
- name: Force binaries directory for Container Linux by CoreOS
set_fact:
bin_dir: "/opt/bin"

Loading…
Cancel
Save