Git submodule manage kubectl-deployer-docker

Git submodule is used to manage kubectl-deployer-docker repo

Signed-off-by: jialv01 <Jianlin.Lv@arm.com>
Change-Id: I822955bfef43304e19aec6b02b6393a4f4401a2e

diff --git a/.gitmodules b/.gitmodules
index c4c869e..7c6c5fa 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -135,3 +135,6 @@
        path = src/use_cases/seba_on_arm/src_repo/beats-docker
        url = https://github.com/iecedge/beats-docker.git
        branch = 6.4.2-arm64v8
+[submodule "kubectl-deployer-docker"]
+       path = src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker
+       url = https://github.com/iecedge/kubectl-deployer-docker.git

diff --git a/src/use_cases/seba_on_arm/docker/build/kubectl-deployer-docker/build.arm b/src/use_cases/seba_on_arm/docker/build/kubectl-deployer-docker/build.arm
new file mode 100755 (executable)
index 0000000..6dfac08
--- /dev/null
+++ b/src/use_cases/seba_on_arm/docker/build/kubectl-deployer-docker/build.arm
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# This script builds the kubectl-deployer docker image
+set -o errexit
+set -o xtrace
+
+#cd $KUBECTL-DEPLOYER-DOCKER_PATH
+
+#building kubectl-deployer docker image
+docker build -t iecedge/kubectl_deployer_arm64:0.4 .

diff --git a/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch b/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch
new file mode 100644 (file)
index 0000000..58b4151
--- /dev/null
+++ b/src/use_cases/seba_on_arm/patches/kubectl-deployer-docker/0001-Add-arm64-support-for-kubectl-deployer-images-build.patch
@@ -0,0 +1,33 @@
+From ea01e03a45227bb9aad77c454bb9c6c064522690 Mon Sep 17 00:00:00 2001
+From: jialv01 <Jianlin.Lv@arm.com>
+Date: Tue, 14 May 2019 17:37:53 +0800
+Subject: [PATCH] Add arm64 support for kubectl-deployer images build
+
+Signed-off-by: jialv01 <Jianlin.Lv@arm.com>
+---
+ Dockerfile | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Dockerfile b/Dockerfile
+index 117b386..88195c6 100644
+--- a/Dockerfile
++++ b/Dockerfile
+@@ -1,13 +1,11 @@
+ FROM alpine:3.6
+ 
+-LABEL MAINTAINER="Sergii Nuzhdin <ipaq.lw@gmail.com@gmail.com>"
+-
+-ENV KUBE_LATEST_VERSION="v1.13.0"
++ENV KUBE_LATEST_VERSION="v1.6.4"
+ 
+ RUN apk add --update ca-certificates \
+     && apk add --update -t deps curl \
+     && apk add --update gettext \
+-    && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
++    && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/arm64/kubectl -o /usr/local/bin/kubectl \
+     && chmod +x /usr/local/bin/kubectl \
+     && apk del --purge deps \
+     && rm /var/cache/apk/*
+-- 
+2.17.1
+

diff --git a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker b/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker
new file mode 160000 (submodule)
index 0000000..06cf7cc
--- /dev/null
+++ b/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker
@@ -0,0 +1 @@
+Subproject commit 06cf7cc6529ff0e4f7d7414da386887e8550c1a3

diff --git a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/Dockerfile b/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/Dockerfile
deleted file mode 100644 (file)
index 117b386..0000000
--- a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM alpine:3.6
-
-LABEL MAINTAINER="Sergii Nuzhdin <ipaq.lw@gmail.com@gmail.com>"
-
-ENV KUBE_LATEST_VERSION="v1.13.0"
-
-RUN apk add --update ca-certificates \
-    && apk add --update -t deps curl \
-    && apk add --update gettext \
-    && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
-    && chmod +x /usr/local/bin/kubectl \
-    && apk del --purge deps \
-    && rm /var/cache/apk/*

diff --git a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/Dockerfile.arm64 b/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/Dockerfile.arm64
deleted file mode 100644 (file)
index 78f0cfb..0000000
--- a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/Dockerfile.arm64
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM alpine:3.6
-
-ENV KUBE_LATEST_VERSION="v1.13.0"
-
-RUN apk add --update ca-certificates \
-    && apk add --update -t deps curl \
-    && apk add --update gettext \
-    && curl -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/arm64/kubectl -o /usr/local/bin/kubectl \
-    && chmod +x /usr/local/bin/kubectl \
-    && apk del --purge deps \
-    && rm /var/cache/apk/*

diff --git a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/README.arm b/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/README.arm
deleted file mode 100644 (file)
index 5058536..0000000
--- a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/README.arm
+++ /dev/null
@@ -1,2 +0,0 @@
-Forked from https://github.com/lwolf/kubectl-deployer-docker.git
-Added Dockerfile.arm64 for aarch64 support.

diff --git a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/README.md b/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/README.md
deleted file mode 100644 (file)
index 341ec90..0000000
--- a/src/use_cases/seba_on_arm/src_repo/kubectl-deployer-docker/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# kubectl-deployer-docker
-
-Alpine based image with kubectl and gettext used in gitlab-ci build steps.
-
-http://blog.lwolf.org/post/continuous-deployment-to-kubernetes-from-gitlab-ci/
-
-docker image location: https://hub.docker.com/r/lwolf/kubectl_deployer/
-
-|  Tag   | Alpine | Kubectl |
-| :----: | :----: | :-----: |
-| latest |  3.6   | 1.13.0  |
-| 1.13.0 |  3.6   | 1.13.0  |
-| 1.10.0 |  3.6   | 1.10.0  |
-| 1.8.9  |  3.6   |  1.8.9  |
-|  0.4   |  3.6   |  1.6.4  |
-|  0.3   |  3.4   |  1.6.4  |
-|  0.2   |  3.4   |  1.5.2  |