Browse code
Add k8s containers, align k8s container names with standard naming.
Change-Id: I3e55d2accecb8444582dd0f8eda49602ed6df0f5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3401
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Bo Gan <ganb@vmware.com>
Vinay Kulkarni authored on 2017/08/03 22:59:16Showing 8 changed files
- Makefile
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-apiserver
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-controller-manager
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-proxy
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-scheduler
- support/dockerfiles/k8s-docker-images/build-k8s-dashboard-docker-images.sh
- support/dockerfiles/k8s-docker-images/build-k8s-dns-docker-images.sh
- support/dockerfiles/k8s-docker-images/build-k8s-docker-images.sh
| ... | ... |
@@ -396,6 +396,7 @@ photon-docker-image: |
| 396 | 396 |
k8s-docker-images: |
| 397 | 397 |
systemctl start docker && \ |
| 398 | 398 |
cd ./support/dockerfiles/k8s-docker-images && \ |
| 399 |
+ ./build-k8s-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \ |
|
| 399 | 400 |
./build-k8s-dns-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \ |
| 400 | 401 |
./build-k8s-dashboard-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) |
| 401 | 402 |
|
| 0 | 9 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,11 @@ |
| 0 |
+# Photon Base Build Container |
|
| 1 |
+ |
|
| 2 |
+FROM vmware/photon |
|
| 3 |
+ |
|
| 4 |
+MAINTAINER kulkarniv@vmware.com |
|
| 5 |
+ |
|
| 6 |
+RUN tdnf install -y ebtables iptables iproute2 shadow socat |
|
| 7 |
+ADD tmp/k8s/usr/bin/kube-proxy /usr/bin/kube-proxy |
|
| 8 |
+RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy |
|
| 9 |
+ |
|
| 10 |
+CMD ["/usr/bin/kube-proxy"] |
| ... | ... |
@@ -13,7 +13,7 @@ K8S_DASH_VER=`cat ${SPEC_DIR}/kubernetes-dashboard/kubernetes-dashboard.spec | g
|
| 13 | 13 |
K8S_DASH_VER_REL=${K8S_DASH_VER}-`cat ${SPEC_DIR}/kubernetes-dashboard/kubernetes-dashboard.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`
|
| 14 | 14 |
K8S_DASH_RPM=kubernetes-dashboard-${K8S_DASH_VER_REL}${DIST_TAG}.${ARCH}.rpm
|
| 15 | 15 |
K8S_DASH_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${K8S_DASH_RPM}
|
| 16 |
-K8S_DASH_TAR=k8s-dashboard.tar |
|
| 16 |
+K8S_DASH_TAR=kubernetes-dashboard.tar |
|
| 17 | 17 |
|
| 18 | 18 |
if [ ! -f ${K8S_DASH_RPM_FILE} ]
|
| 19 | 19 |
then |
| ... | ... |
@@ -21,7 +21,7 @@ then |
| 21 | 21 |
exit 1 |
| 22 | 22 |
fi |
| 23 | 23 |
|
| 24 |
-IMG_NAME=vmware/k8s-dashboard-${DIST_VER}:v${K8S_DASH_VER}
|
|
| 24 |
+IMG_NAME=vmware_photon2/kubernetes-dashboard-amd64:v${K8S_DASH_VER}
|
|
| 25 | 25 |
|
| 26 | 26 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 27 | 27 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| ... | ... |
@@ -22,7 +22,7 @@ then |
| 22 | 22 |
fi |
| 23 | 23 |
|
| 24 | 24 |
for K8S_BIN in ${K8S_DNS_BINS[*]}; do
|
| 25 |
- IMG_NAME=vmware/k8s-dns-${K8S_BIN}-${DIST_VER}:v${K8S_DNS_VER}
|
|
| 25 |
+ IMG_NAME=vmware_photon2/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}
|
|
| 26 | 26 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 27 | 27 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| 28 | 28 |
echo "Removing image ${IMG_NAME}"
|
| ... | ... |
@@ -37,7 +37,7 @@ rpm2cpio ${K8S_DNS_RPM} | cpio -vid
|
| 37 | 37 |
popd |
| 38 | 38 |
|
| 39 | 39 |
for K8S_BIN in ${K8S_DNS_BINS[*]}; do
|
| 40 |
- IMG_NAME=vmware/k8s-dns-${K8S_BIN}-${DIST_VER}:v${K8S_DNS_VER}
|
|
| 40 |
+ IMG_NAME=vmware_photon2/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}
|
|
| 41 | 41 |
K8S_TAR_NAME=k8s-dns-${K8S_BIN}.tar
|
| 42 | 42 |
docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .
|
| 43 | 43 |
docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
|
| 44 | 44 |
new file mode 100755 |
| ... | ... |
@@ -0,0 +1,47 @@ |
| 0 |
+#!/bin/bash -e |
|
| 1 |
+ |
|
| 2 |
+DIST_TAG=$1 |
|
| 3 |
+DIST_VER=$2 |
|
| 4 |
+SPEC_DIR=$3 |
|
| 5 |
+STAGE_DIR=$4 |
|
| 6 |
+ARCH=x86_64 |
|
| 7 |
+ |
|
| 8 |
+# |
|
| 9 |
+# Docker images for kubernetes artifacts |
|
| 10 |
+# |
|
| 11 |
+K8S_VER=`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Version | cut -d: -f2 | tr -d ' '`
|
|
| 12 |
+K8S_VER_REL=${K8S_VER}-`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`
|
|
| 13 |
+K8S_RPM=kubernetes-${K8S_VER_REL}${DIST_TAG}.${ARCH}.rpm
|
|
| 14 |
+K8S_RPM_FILE=../../../stage/RPMS/x86_64/${K8S_RPM}
|
|
| 15 |
+ |
|
| 16 |
+if [ ! -f ${K8S_RPM_FILE} ]
|
|
| 17 |
+then |
|
| 18 |
+ echo "Kubernetes RPM ${K8S_RPM_FILE} not found. Exiting.."
|
|
| 19 |
+ exit 1 |
|
| 20 |
+fi |
|
| 21 |
+ |
|
| 22 |
+K8S_BINS=(kube-apiserver kube-controller-manager kube-proxy kube-scheduler) |
|
| 23 |
+for K8S_BIN in ${K8S_BINS[*]}; do
|
|
| 24 |
+ IMG_NAME=vmware_photon2/${K8S_BIN}-amd64:v${K8S_VER}
|
|
| 25 |
+ IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
|
| 26 |
+ if [[ ! -z "${IMG_ID}" ]]; then
|
|
| 27 |
+ echo "Removing image ${IMG_NAME}"
|
|
| 28 |
+ docker rmi -f ${IMG_NAME}
|
|
| 29 |
+ fi |
|
| 30 |
+done |
|
| 31 |
+ |
|
| 32 |
+mkdir -p tmp/k8s |
|
| 33 |
+cp ${K8S_RPM_FILE} tmp/k8s/
|
|
| 34 |
+pushd ./tmp/k8s |
|
| 35 |
+rpm2cpio ${K8S_RPM} | cpio -vid
|
|
| 36 |
+popd |
|
| 37 |
+ |
|
| 38 |
+for K8S_BIN in ${K8S_BINS[*]}; do
|
|
| 39 |
+ IMG_NAME=vmware_photon2/${K8S_BIN}-amd64:v${K8S_VER}
|
|
| 40 |
+ K8S_TAR_NAME=${K8S_BIN}.tar
|
|
| 41 |
+ docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .
|
|
| 42 |
+ docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
|
|
| 43 |
+ mv -f ${K8S_TAR_NAME} ${STAGE_DIR}/
|
|
| 44 |
+done |
|
| 45 |
+ |
|
| 46 |
+rm -rf ./tmp |