From 5a530be776c4897523e3419e69d798de0dc1755c Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sat, 21 Jan 2017 14:17:01 +0000
Subject: Kubernetes: Rename Images to allow use with native deployment tools

Standard Kubernetes deployment tooling expects images to include the
platorm they are built for as a suffix. As kolla does not yet support
any arch other than amd64, we are renaming these to make them easier
to consume.

Change-Id: I8e961db5706d968ee9a66b0c2d2bbcc684d32329
---
 docker/kube/kube-apiserver-amd64/Dockerfile.j2     | 12 +++++++++++
 docker/kube/kube-apiserver/Dockerfile.j2           | 12 -----------
 .../kube-controller-manager-amd64/Dockerfile.j2    | 25 ++++++++++++++++++++++
 docker/kube/kube-controller-manager/Dockerfile.j2  | 25 ----------------------
 docker/kube/kube-discovery-amd64/Dockerfile.j2     | 13 +++++++++++
 docker/kube/kube-discovery/Dockerfile.j2           | 13 -----------
 docker/kube/kube-proxy-amd64/Dockerfile.j2         | 12 +++++++++++
 docker/kube/kube-proxy/Dockerfile.j2               | 12 -----------
 docker/kube/kube-scheduler-amd64/Dockerfile.j2     | 12 +++++++++++
 docker/kube/kube-scheduler/Dockerfile.j2           | 12 -----------
 10 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 docker/kube/kube-apiserver-amd64/Dockerfile.j2
 delete mode 100644 docker/kube/kube-apiserver/Dockerfile.j2
 create mode 100644 docker/kube/kube-controller-manager-amd64/Dockerfile.j2
 delete mode 100644 docker/kube/kube-controller-manager/Dockerfile.j2
 create mode 100644 docker/kube/kube-discovery-amd64/Dockerfile.j2
 delete mode 100644 docker/kube/kube-discovery/Dockerfile.j2
 create mode 100644 docker/kube/kube-proxy-amd64/Dockerfile.j2
 delete mode 100644 docker/kube/kube-proxy/Dockerfile.j2
 create mode 100644 docker/kube/kube-scheduler-amd64/Dockerfile.j2
 delete mode 100644 docker/kube/kube-scheduler/Dockerfile.j2

diff --git a/docker/kube/kube-apiserver-amd64/Dockerfile.j2 b/docker/kube/kube-apiserver-amd64/Dockerfile.j2
new file mode 100644
index 000000000..9edd42a5e
--- /dev/null
+++ b/docker/kube/kube-apiserver-amd64/Dockerfile.j2
@@ -0,0 +1,12 @@
+FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+ENV KUBERNETES_COMPONENT=kube-apiserver
+
+RUN true \
+    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
+    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT []
+CMD []
diff --git a/docker/kube/kube-apiserver/Dockerfile.j2 b/docker/kube/kube-apiserver/Dockerfile.j2
deleted file mode 100644
index 9edd42a5e..000000000
--- a/docker/kube/kube-apiserver/Dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-ENV KUBERNETES_COMPONENT=kube-apiserver
-
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
diff --git a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2
new file mode 100644
index 000000000..713778c8e
--- /dev/null
+++ b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2
@@ -0,0 +1,25 @@
+FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+ENV KUBERNETES_COMPONENT=kube-controller-manager
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+   {% set ceph_support_packages = [
+        'ceph-common'
+    ] %}
+{% elif base_distro in ['ubuntu', 'debian'] %}
+   {% set ceph_support_packages = [
+        'ceph-common'
+    ] %}
+{% endif %}
+{{ macros.install_packages(ceph_support_packages | customizable("packages")) }}
+
+RUN true \
+    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
+    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT []
+CMD []
diff --git a/docker/kube/kube-controller-manager/Dockerfile.j2 b/docker/kube/kube-controller-manager/Dockerfile.j2
deleted file mode 100644
index 713778c8e..000000000
--- a/docker/kube/kube-controller-manager/Dockerfile.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-ENV KUBERNETES_COMPONENT=kube-controller-manager
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-   {% set ceph_support_packages = [
-        'ceph-common'
-    ] %}
-{% elif base_distro in ['ubuntu', 'debian'] %}
-   {% set ceph_support_packages = [
-        'ceph-common'
-    ] %}
-{% endif %}
-{{ macros.install_packages(ceph_support_packages | customizable("packages")) }}
-
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
diff --git a/docker/kube/kube-discovery-amd64/Dockerfile.j2 b/docker/kube/kube-discovery-amd64/Dockerfile.j2
new file mode 100644
index 000000000..37e5d14dc
--- /dev/null
+++ b/docker/kube/kube-discovery-amd64/Dockerfile.j2
@@ -0,0 +1,13 @@
+FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+ENV KUBERNETES_COMPONENT=kube-discovery
+
+# To match upstream we load the binary to /usr/local/bin
+RUN true \
+    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/local/bin/${KUBERNETES_COMPONENT} \
+    && chmod +x /usr/local/bin/${KUBERNETES_COMPONENT}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT []
+CMD []
diff --git a/docker/kube/kube-discovery/Dockerfile.j2 b/docker/kube/kube-discovery/Dockerfile.j2
deleted file mode 100644
index 37e5d14dc..000000000
--- a/docker/kube/kube-discovery/Dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-ENV KUBERNETES_COMPONENT=kube-discovery
-
-# To match upstream we load the binary to /usr/local/bin
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/local/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/local/bin/${KUBERNETES_COMPONENT}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
diff --git a/docker/kube/kube-proxy-amd64/Dockerfile.j2 b/docker/kube/kube-proxy-amd64/Dockerfile.j2
new file mode 100644
index 000000000..7eafe8fcd
--- /dev/null
+++ b/docker/kube/kube-proxy-amd64/Dockerfile.j2
@@ -0,0 +1,12 @@
+FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+ENV KUBERNETES_COMPONENT=kube-proxy
+
+RUN true \
+    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
+    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT []
+CMD []
diff --git a/docker/kube/kube-proxy/Dockerfile.j2 b/docker/kube/kube-proxy/Dockerfile.j2
deleted file mode 100644
index 7eafe8fcd..000000000
--- a/docker/kube/kube-proxy/Dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-ENV KUBERNETES_COMPONENT=kube-proxy
-
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
diff --git a/docker/kube/kube-scheduler-amd64/Dockerfile.j2 b/docker/kube/kube-scheduler-amd64/Dockerfile.j2
new file mode 100644
index 000000000..7009b396f
--- /dev/null
+++ b/docker/kube/kube-scheduler-amd64/Dockerfile.j2
@@ -0,0 +1,12 @@
+FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+ENV KUBERNETES_COMPONENT=kube-scheduler
+
+RUN true \
+    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
+    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT []
+CMD []
diff --git a/docker/kube/kube-scheduler/Dockerfile.j2 b/docker/kube/kube-scheduler/Dockerfile.j2
deleted file mode 100644
index 7009b396f..000000000
--- a/docker/kube/kube-scheduler/Dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-ENV KUBERNETES_COMPONENT=kube-scheduler
-
-RUN true \
-    && curl -L ${KUBERNETES_DOWNLOAD_ROOT}/${KUBERNETES_COMPONENT} -o /usr/bin/${KUBERNETES_COMPONENT} \
-    && chmod +x /usr/bin/${KUBERNETES_COMPONENT}
-
-# Clear any customisation by Kolla to entrypoint & command
-ENTRYPOINT []
-CMD []
-- 
cgit v1.2.3