From 07cb8ebef754c0e52d49d81ec07baad456ecfaa3 Mon Sep 17 00:00:00 2001
From: Sergey Nuzhdin <ipaq.lw@gmail.com>
Date: Wed, 5 Jun 2019 08:05:55 +0100
Subject: [PATCH] Add support for arm images for hyperkube, kubeadm and
 cni_binary (#4261)

* Add support for arm images for hyperkube, kubeadm and cni_binary

* Add dummy etcd checksum for arm

This commit adds dummy etcd checksum for arm to avoid "no attribute" error
during setup.

* Add etcd host assert check

* Add 1.13.4 checksums of kubeadm and hyperkube for arm

* Update checksums of kubeadm and hyperkube for arm

* Add dummy checksums for calicoctl_binary_checksums dict

* disable gather_facts because it causes tests to fail

* Remove architecture check for etcd, due to unable to run tests
---
 roles/download/defaults/main.yml              | 37 +++++++++++++++++++
 .../preinstall/tasks/0040-set_facts.yml       |  1 +
 2 files changed, 38 insertions(+)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 717df9963..6d737f361 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -75,6 +75,21 @@ calicoctl_download_url: "https://github.com/projectcalico/calicoctl/releases/dow
 
 # Checksums
 hyperkube_checksums:
+  arm:
+    v1.14.0: d090b1da23564a7e9bb8f1f4264f2116536c52611ae203fe2ca13eaad0a8003e
+    v1.13.5: 0bc1ecec81f94212a44427a8d9e717a523ea09d45886e641796fb20f41028b2f
+    v1.13.4: 2530212d807b00c94109b84be42a7baaea97ba91e6bb6c8bca03ab3d5c343c4c
+    v1.13.3: 4051e88174fedc0ea643466081ca461d9d175f714594dbe5208559fed0c4ae49
+    v1.13.2: a981aa0950e86a4380526a3a53f465ce013b95f6d9d8139a9df4a6406b67316f
+    v1.13.1: 1880ba36aae85474bcea42be0bf37dfa70eb23dd71eb8e956c474e004343f5a4
+    v1.13.0: 41c05bf9b0272322fc947760030c21907c21dd8a88576b20cdb110003e818b8f
+    v1.12.6: ba47da779e716f87689cfe097252e5a806ada03c932216dafea2aca27e3f7d33
+    v1.12.5: 5308182b6d8b546eb61737a1f962b4283c67e25fa205016f8cb7fcb3b51b8f39
+    v1.12.4: 8e6ee8d10d8d13b453315811ed1ab60b0092f9168c933712fd176085cf080bb0
+    v1.12.3: 303b47eced6b4f8a8e56d0c01c23d17f42ee7527b1537b1243445bb54606fb61
+    v1.12.2: 4e4fff764bef10b092d17be501eb63d2f8a72ce3c44e17155fe0cb0315384a20
+    v1.12.1: 4cc7648c160c6dd57953034e137664072a5de902efc0104062618fbc6e26a304
+    v1.12.0: f061def3fedc3873447998f6a16ed012ba4800b693f4646baac2acb7cd919302
   arm64:
     v1.14.1: d5236efc2547fd07c7cc2ed9345dfbcd1204385847ca686cf1c62d15056de399
     v1.14.0: 708e00a41f6516d525dee00c91ebe3c3bf2feaf9b7f0af7689487e3e17e356c2
@@ -108,6 +123,21 @@ hyperkube_checksums:
     v1.12.1: 4aa23cfb2fc2e2e4d0cbe0d83a648c38e4baabd6c66f5cdbbb40cbc7582fdc74
     v1.12.0: f80336201f3152a5307c01f8a7206847398dde15c69b3d20c76a7d9520b60daf
 kubeadm_checksums:
+  arm:
+    v1.14.0: 11f2cfa8bf7ee177dbac8073ab0f039dc265536baaa8dc0c4dea699f981f6fd1
+    v1.13.5: 3eb413c6e7f3fc84ca81de2f725bae8618c65d92a50c6e1e89ce157828ca588c
+    v1.13.4: 9281b57f0e62330b3905774e38dfad7430d0d54c50cd2a0f87e6c993bb784b17
+    v1.13.3: 77afb511c895bc6fb0d2ee3198a0c15d89c0f19bf91fb1fb6274634e3e147d4a
+    v1.13.2: 5bf5d766050245abde802fdea77a85586ce1477e538bcc4fa618bba854c18980
+    v1.13.1: c92bc8672a31158e33489ec9285d0a5546cb5be5bdfdb8cd424fff08439fff9c
+    v1.13.0: a35e9248fccddb3f2381fd3695c889a576e9ecc63f2b3c9bb0e8daf0308427ef
+    v1.12.6: 12c1bd47bef9ba6a821ee5663714b8330b6d3dad7f0f41a352c3c3959405bc3e
+    v1.12.5: 1f995888976b9d9fe7621a5a77b2ed0c7cf3cd5163dbd621071c6ff99467325c
+    v1.12.4: 9d33673798507959b888f1f82b418e0239c2e9588492b3d7ffee979dbd136c4a
+    v1.12.3: e0e4aa97bb11d92da1785fe4e6c9333a995fd583f5878bcd648bd237723a06d2
+    v1.12.2: 982013a9a3163e64e3cee628d9dbc9550a16e4fdf90e25ad663de85cdb4a5de3
+    v1.12.1: f3c2148d957882fc032c4a3a11d77a8d1f6ab0e77e2532f1ee4f4fe9a599fc3d
+    v1.12.0: bdea48f21f9c55628f9449529bf0ebe9f1ad6712e0b55ad2506236b8203fc240
   arm64:
     v1.14.1: 5cf05464168e45ee4719264a267c65f9319fae1ceb9923fedab97a9d6a629e0b
     v1.14.0: 7ed9d706e50cd6d3fc618a7af3d19b691b8a5343ddedaeccb4ea09af3ecfae2c
@@ -142,12 +172,19 @@ kubeadm_checksums:
     v1.12.0: 463fb058b7fa2591fb01f29f2451b054f6cbaa0f8a20394b4a4eb5d68473176f
 
 etcd_binary_checksums:
+  # Etcd does not have arm32 builds at the moment, having some dummy value is
+  # required to avoid "no attribute" error
+  arm: 0
   arm64: c219b254ece7d7e308ae41569fa240dbae2de460bed818ee39b408b73f6360ef
   amd64: 127d4f2097c09d929beb9d3784590cc11102f4b4d4d4da7ad82d5c9e856afd38
 cni_binary_checksums:
+  arm: ffb62021d2fc6e1266dc6ef7f2058125b6e6b44c016291a2b04a15ed9b4be70a
   arm64: 016bbc989877e35e3cd49fafe11415fb2717e52c74fde6b1650411154cb91b81
   amd64: f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d
 calicoctl_binary_checksums:
+  arm:
+    v3.5.4: 0
+    v3.4.4: 0
   amd64:
     v3.6.1: 3b01336de37550e020343d62a38c96c4605d33a3ed7ddba2fe38bc172a5b42b5
     v3.5.4: 197194b838cc2a9a7455c2ebd5505a5e24f8f3d994eb75c17f5dd568944100b8
diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
index 0b1cad77a..796f21d7f 100644
--- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
+++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
@@ -4,6 +4,7 @@
     architecture_groups:
       x86_64: amd64
       aarch64: arm64
+      armv7l: arm
 
 - name: ansible_architecture_rename
   set_fact: