docker/kube-conformance/patches/aarch64/0001-Dockerfile-Makefile-Add-AArch64-support.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 25 Jun 2019 17:59:13 +0200
   3 Subject: [PATCH] Dockerfile, Makefile: Add AArch64 support
   4
   5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   6 ---
   7  Dockerfile | 6 ++++--
   8  Makefile   | 8 +++++---
   9  2 files changed, 9 insertions(+), 5 deletions(-)
  10
  11 diff --git a/Dockerfile b/Dockerfile
  12 index 289ac88..102685d 100644
  13 --- a/Dockerfile
  14 +++ b/Dockerfile
  15 @@ -13,10 +13,12 @@
  16  # See the License for the specific language governing permissions and
  17  # limitations under the License.
  18
  19 -FROM buildpack-deps:jessie-scm
  20 +FROM arm64v8/buildpack-deps:jessie-scm
  21  MAINTAINER Timothy St. Clair "tstclair@heptio.com"
  22
  23 -RUN apt-get update && apt-get -y --no-install-recommends install \
  24 +RUN echo 'Acquire::Check-Valid-Until "0";' > /etc/apt/apt.conf.d/10no--check-valid-until \
  25 +    && sed -i -e '/security/s/^/#/g' -e 's|deb.debian.org/debian|snapshot.debian.org/archive/debian/20190301T035241Z|g' /etc/apt/sources.list \
  26 +    && apt-get update && apt-get -y --no-install-recommends install \
  27      ca-certificates \
  28      && rm -rf /var/cache/apt/* \
  29      && rm -rf /var/lib/apt/lists/*
  30 diff --git a/Makefile b/Makefile
  31 index 4335cfd..bdaa52c 100644
  32 --- a/Makefile
  33 +++ b/Makefile
  34 @@ -29,6 +29,8 @@ is_root=$(filter 0,$(shell id -u))
  35  DOCKER?=$(if $(or $(in_docker_group),$(is_root)),docker,sudo docker)
  36  DIR := ${CURDIR}
  37
  38 +export KUBERNETES_SERVER_ARCH=arm64
  39 +
  40  .PHONY: all container getbins clean
  41
  42  all: container
  43 @@ -47,9 +49,9 @@ _cache/.getbins.$(kube_version_full).timestamp:
  44                                           KUBERNETES_DOWNLOAD_TESTS=true \
  45                                           KUBERNETES_SKIP_CONFIRM=true ./kubernetes/cluster/get-kube-binaries.sh
  46         mv _cache/$(kube_version_full)/kubernetes/cluster ./
  47 -       mv _cache/$(kube_version_full)/kubernetes/platforms/linux/amd64/e2e.test ./
  48 -       mv _cache/$(kube_version_full)/kubernetes/platforms/linux/amd64/ginkgo ./
  49 -       mv _cache/$(kube_version_full)/kubernetes/platforms/linux/amd64/kubectl ./
  50 +       mv _cache/$(kube_version_full)/kubernetes/platforms/linux/arm64/e2e.test ./
  51 +       mv _cache/$(kube_version_full)/kubernetes/platforms/linux/arm64/ginkgo ./
  52 +       mv _cache/$(kube_version_full)/kubernetes/platforms/linux/arm64/kubectl ./
  53         touch $@
  54
  55  container: e2e.test kubectl ginkgo