From 2f1fe447620519d16933d33cbe7124aaa835641c Mon Sep 17 00:00:00 2001
From: Antoine Legrand <2t.antoine@gmail.com>
Date: Thu, 23 Aug 2018 16:47:18 +0200
Subject: [PATCH] update images to use arch

---
 roles/download/defaults/main.yml                | 12 ++++++------
 roles/kubernetes-apps/ansible/defaults/main.yml |  3 ++-
 roles/network_plugin/calico/tasks/check.yml     |  2 +-
 roles/vault/defaults/main.yml                   |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index c84392352..9b56dbf13 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -68,13 +68,13 @@ flannel_image_tag: "{{ flannel_version }}"
 flannel_cni_image_repo: "quay.io/coreos/flannel-cni"
 flannel_cni_image_tag: "{{ flannel_cni_version }}"
 calicoctl_image_repo: "quay.io/calico/ctl"
-calicoctl_image_tag: "{{ calico_ctl_version }}"
+calicoctl_image_tag: "{{ calico_ctl_version }}-{{ image_arch }}"
 calico_node_image_repo: "quay.io/calico/node"
-calico_node_image_tag: "{{ calico_version }}"
+calico_node_image_tag: "{{ calico_version }}-{{ image_arch }}"
 calico_cni_image_repo: "quay.io/calico/cni"
-calico_cni_image_tag: "{{ calico_cni_version }}"
+calico_cni_image_tag: "{{ calico_cni_version }}-{{ image_arch }}"
 calico_policy_image_repo: "quay.io/calico/kube-controllers"
-calico_policy_image_tag: "{{ calico_policy_version }}"
+calico_policy_image_tag: "{{ calico_policy_version }}-{{ image_arch }}"
 calico_rr_image_repo: "quay.io/calico/routereflector"
 calico_rr_image_tag: "{{ calico_rr_version }}"
 hyperkube_image_repo: "gcr.io/google-containers/hyperkube-{{ image_arch }}"
@@ -109,9 +109,9 @@ kubedns_version: 1.14.10
 kubedns_image_repo: "gcr.io/google_containers/k8s-dns-kube-dns-{{ image_arch }}"
 kubedns_image_tag: "{{ kubedns_version }}"
 
-coredns_version: "{%- if image_arch != 'amd64' -%}1.1.3{%- else -%}1.2.0{%- endif %}"
+coredns_version: "{%- if image_arch != 'amd64' -%}1.1.3{%- else -%}1.2.0{%- endif -%}"
 coredns_image_repo: "gcr.io/google-containers/coredns"
-coredns_image_tag: "{{ coredns_version }}{%- if image_arch != 'amd64' -%}__{{ image_arch}}_linux{%- endif %}"
+coredns_image_tag: "{{ coredns_version }}{%- if image_arch != 'amd64' -%}__{{ image_arch}}_linux{%- endif -%}"
 
 
 dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-{{ image_arch }}"
diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml
index ef17c57b9..6a60e09d8 100644
--- a/roles/kubernetes-apps/ansible/defaults/main.yml
+++ b/roles/kubernetes-apps/ansible/defaults/main.yml
@@ -14,7 +14,8 @@ kubedns_nodes_per_replica: 10
 coredns_replicas: 2
 
 # Images
-image_arch: amd64
+image_arch: "{{host_architecture}}"
+
 kubedns_image_repo: "gcr.io/google_containers/k8s-dns-kube-dns-{{ image_arch }}"
 kubedns_image_tag: "{{ kubedns_version }}"
 dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-{{ image_arch }}"
diff --git a/roles/network_plugin/calico/tasks/check.yml b/roles/network_plugin/calico/tasks/check.yml
index 4eca9cc65..cfacf12a1 100644
--- a/roles/network_plugin/calico/tasks/check.yml
+++ b/roles/network_plugin/calico/tasks/check.yml
@@ -34,4 +34,4 @@
     - 'calico_version_on_server.stdout is defined'
     - 'calico_version_on_server.stdout != ""'
     - inventory_hostname == groups['kube-master'][0]
-  run_once: yes
\ No newline at end of file
+  run_once: yes
diff --git a/roles/vault/defaults/main.yml b/roles/vault/defaults/main.yml
index 1051ca8d6..1d05cfefc 100644
--- a/roles/vault/defaults/main.yml
+++ b/roles/vault/defaults/main.yml
@@ -24,7 +24,7 @@ vault_binary_checksum: 66f0f1b0b221d664dd5913f8697409d7401df4bb2a19c7277e8fbad15
 vault_download_url: "https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_{{ image_arch }}.zip"
 
 # Arch of Docker images and needed packages
-image_arch: amd64
+image_arch: "{{host_architecture}}"
 
 vault_download_vars:
   container: "{{ vault_deployment_type != 'host' }}"