@@ -401,6 +401,7 @@ photon-docker-image:

 k8s-docker-images:

 	systemctl start docker && \

 	cd ./support/dockerfiles/k8s-docker-images && \

+	./build-k8s-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

 	./build-k8s-dns-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

 	./build-k8s-dashboard-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE)

@@ -1,7 +1,7 @@

 Summary:        Kubernetes cluster management

 Name:           kubernetes

 Version:        1.7.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz

 Source0:        kubernetes-v%{version}.tar.gz

@@ -22,11 +22,19 @@ Requires:       iptables

 Requires:       iproute2

 Requires:       shadow

 Requires:       socat

+Requires:       systemd

 Requires:       util-linux

 %description

 Kubernetes is an open source implementation of container cluster management.

+%package        kubeadm

+Summary:        kubeadm deployment tool

+Group:          Development/Tools

+Requires:       %{name} = %{version}

+%description    kubeadm

+kubeadm is a tool that enables quick and easy deployment of a kubernetes cluster.

+

 %prep -p exit

 %setup -qn %{name}-%{version}

 cd ..

@@ -41,12 +49,19 @@ make

 install -vdm644 %{buildroot}/etc/profile.d

 install -m 755 -d %{buildroot}%{_bindir}

-binaries=(cloud-controller-manager hyperkube kubeadm kube-aggregator kube-apiserver kube-controller-manager kubelet kube-proxy kube-scheduler kubectl kubefed)

+binaries=(cloud-controller-manager hyperkube kube-aggregator kube-apiserver kube-controller-manager kubelet kube-proxy kube-scheduler kubectl kubefed)

 for bin in "${binaries[@]}"; do

   echo "+++ INSTALLING ${bin}"

   install -p -m 755 -t %{buildroot}%{_bindir} _output/local/bin/linux/amd64/${bin}

 done

+# kubeadm install

+install -vdm644 %{buildroot}/etc/systemd/system/kubelet.service.d

+install -p -m 755 -t %{buildroot}%{_bindir} _output/local/bin/linux/amd64/kubeadm

+install -p -m 755 -t %{buildroot}/etc/systemd/system build/rpms/kubelet.service

+install -p -m 755 -t %{buildroot}/etc/systemd/system/kubelet.service.d build/rpms/10-kubeadm.conf

+sed -i '/KUBELET_CGROUP_ARGS=--cgroup-driver=systemd/d' %{buildroot}/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

+

 cd ..

 # install config files

 install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}

@@ -84,17 +99,44 @@ fi

 %post

 chown -R kube:kube /var/lib/kubelet

 chown -R kube:kube /var/run/kubernetes

+systemctl daemon-reload

+

+%post kubeadm

+systemctl daemon-reload

+systemctl stop kubelet

+systemctl enable docker kubelet

+systemctl start docker

+

+%preun kubeadm

+if [ $1 -eq 0 ]; then

+    systemctl stop kubelet

+fi

 %postun

 if [ $1 -eq 0 ]; then

     # Package deletion

     userdel kube

     groupdel kube

+    systemctl daemon-reload

+fi

+

+%postun kubeadm

+if [ $1 -eq 0 ]; then

+    systemctl daemon-reload

 fi

 %files

 %defattr(-,root,root)

-%{_bindir}/*

+%{_bindir}/cloud-controller-manager

+%{_bindir}/hyperkube

+%{_bindir}/kube-aggregator

+%{_bindir}/kube-apiserver

+%{_bindir}/kube-controller-manager

+%{_bindir}/kubelet

+%{_bindir}/kube-proxy

+%{_bindir}/kube-scheduler

+%{_bindir}/kubectl

+%{_bindir}/kubefed

 %{_lib}/systemd/system/kube-apiserver.service

 %{_lib}/systemd/system/kubelet.service

 %{_lib}/systemd/system/kube-scheduler.service

@@ -111,7 +153,15 @@ fi

 %config(noreplace) %{_sysconfdir}/%{name}/kubelet

 %config(noreplace) %{_sysconfdir}/%{name}/scheduler

+%files kubeadm

+%defattr(-,root,root)

+%{_bindir}/kubeadm

+/etc/systemd/system/kubelet.service

+/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

+

 %changelog

+*   Sat Aug 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.0-2

+-   Split kubeadm into its own pkg.

 *   Fri Jul 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.7.0-1

 -   Upgrade kubernetes to v1.7.0.

 *   Tue May 09 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.6.0-3

new file mode 100644

@@ -0,0 +1,9 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+ADD tmp/k8s/usr/bin/kube-apiserver /usr/bin/kube-apiserver

+

+CMD ["/usr/bin/kube-apiserver"]

new file mode 100644

@@ -0,0 +1,9 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+ADD tmp/k8s/usr/bin/kube-controller-manager /usr/bin/kube-controller-manager

+

+CMD ["/usr/bin/kube-controller-manager"]

new file mode 100644

@@ -0,0 +1,11 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+RUN tdnf install -y ebtables iptables iproute2 shadow socat

+ADD tmp/k8s/usr/bin/kube-proxy /usr/bin/kube-proxy

+RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy

+

+CMD ["/usr/bin/kube-proxy"]

new file mode 100644

@@ -0,0 +1,9 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+ADD tmp/k8s/usr/bin/kube-scheduler /usr/bin/kube-scheduler

+

+CMD ["/usr/bin/kube-scheduler"]

@@ -13,7 +13,7 @@ K8S_DASH_VER=`cat ${SPEC_DIR}/kubernetes-dashboard/kubernetes-dashboard.spec | g

 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`

 K8S_DASH_RPM=kubernetes-dashboard-${K8S_DASH_VER_REL}${DIST_TAG}.${ARCH}.rpm

 K8S_DASH_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${K8S_DASH_RPM}

-K8S_DASH_TAR=k8s-dashboard.tar

+K8S_DASH_TAR=kubernetes-dashboard.tar

 if [ ! -f ${K8S_DASH_RPM_FILE} ]

 then

@@ -21,7 +21,7 @@ then

     exit 1

 fi

-IMG_NAME=vmware/k8s-dashboard-${DIST_VER}:v${K8S_DASH_VER}

+IMG_NAME=vmware_photon/kubernetes-dashboard-amd64:v${K8S_DASH_VER}

 IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

 if [[ ! -z "${IMG_ID}" ]]; then

@@ -22,7 +22,7 @@ then

 fi

 for K8S_BIN in ${K8S_DNS_BINS[*]}; do

-    IMG_NAME=vmware/k8s-dns-${K8S_BIN}-${DIST_VER}:v${K8S_DNS_VER}

+    IMG_NAME=vmware_photon/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}

     IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

     if [[ ! -z "${IMG_ID}" ]]; then

         echo "Removing image ${IMG_NAME}"

@@ -37,7 +37,7 @@ rpm2cpio ${K8S_DNS_RPM} | cpio -vid

 popd

 for K8S_BIN in ${K8S_DNS_BINS[*]}; do

-    IMG_NAME=vmware/k8s-dns-${K8S_BIN}-${DIST_VER}:v${K8S_DNS_VER}

+    IMG_NAME=vmware_photon/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}

     K8S_TAR_NAME=k8s-dns-${K8S_BIN}.tar

     docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .

     docker save -o ${K8S_TAR_NAME} ${IMG_NAME}

new file mode 100755

@@ -0,0 +1,47 @@

+#!/bin/bash -e

+

+DIST_TAG=$1

+DIST_VER=$2

+SPEC_DIR=$3

+STAGE_DIR=$4

+ARCH=x86_64

+

+#

+# Docker images for kubernetes artifacts

+#

+K8S_VER=`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Version | cut -d: -f2 | tr -d ' '`

+K8S_VER_REL=${K8S_VER}-`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

+K8S_RPM=kubernetes-${K8S_VER_REL}${DIST_TAG}.${ARCH}.rpm

+K8S_RPM_FILE=../../../stage/RPMS/x86_64/${K8S_RPM}

+

+if [ ! -f ${K8S_RPM_FILE} ]

+then

+    echo "Kubernetes RPM ${K8S_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

+K8S_BINS=(kube-apiserver kube-controller-manager kube-proxy kube-scheduler)

+for K8S_BIN in ${K8S_BINS[*]}; do

+    IMG_NAME=vmware_photon/${K8S_BIN}-amd64:v${K8S_VER}

+    IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

+    if [[ ! -z "${IMG_ID}" ]]; then

+        echo "Removing image ${IMG_NAME}"

+        docker rmi -f ${IMG_NAME}

+    fi

+done

+

+mkdir -p tmp/k8s

+cp ${K8S_RPM_FILE} tmp/k8s/

+pushd ./tmp/k8s

+rpm2cpio ${K8S_RPM} | cpio -vid

+popd

+

+for K8S_BIN in ${K8S_BINS[*]}; do

+    IMG_NAME=vmware_photon/${K8S_BIN}-amd64:v${K8S_VER}

+    K8S_TAR_NAME=${K8S_BIN}.tar

+    docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .

+    docker save -o ${K8S_TAR_NAME} ${IMG_NAME}

+    mv -f ${K8S_TAR_NAME} ${STAGE_DIR}/

+done

+

+rm -rf ./tmp