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

 Summary:        Kubernetes DNS

 Name:           kubernetes-dns

-Version:        1.14.4

+Version:        1.14.6

 Release:        1%{?dist}

 License:        ASL 2.0

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

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

-%define sha1    kubernetes-dns-%{version}.tar.gz=62020dc207ff3db9e6a7b7c3c64564d4cc5d5c66

+%define sha1    kubernetes-dns-%{version}.tar.gz=456f28dcb52d5338ce076d62051e33b827172b2a

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -65,6 +65,8 @@ rm -rf %{buildroot}/*

 %{_bindir}/sidecar-e2e

 %changelog

+*   Mon Oct 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.6-1

+-   kubernetes-dns 1.14.6.

 *   Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.4-1

 -   kubernetes-dns 1.14.4.

 *   Tue Jul 04 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.2-2

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

     exit 1

 fi

-IMG_NAME=vmware_photon/flannel:v${FLANNEL_VER}

+IMG_NAME=vmware_photon_${DIST_VER}/flannel:v${FLANNEL_VER}

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

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

@@ -36,6 +36,7 @@ rpm2cpio ${FLANNEL_RPM} | cpio -vid

 popd

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

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

-mv -f ${FLANNEL_TAR} ${STAGE_DIR}/

+gzip ${FLANNEL_TAR}

+mv -f ${FLANNEL_TAR}.gz ${STAGE_DIR}/

 rm -rf ./tmp

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

     exit 1

 fi

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

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

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

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

@@ -39,7 +39,8 @@ cp -p -r opt/k8dashboard/* img/

 cd img

 docker build --rm -t ${IMG_NAME} .

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

-mv -f ${K8S_DASH_TAR} ${STAGE_DIR}/

+gzip ${K8S_DASH_TAR}

+mv -f ${K8S_DASH_TAR}.gz ${STAGE_DIR}/

 popd

 rm -rf ./tmp

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

 fi

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

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

+    IMG_NAME=vmware_photon_${DIST_VER}/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,11 +37,12 @@ rpm2cpio ${K8S_DNS_RPM} | cpio -vid

 popd

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

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

+    IMG_NAME=vmware_photon_${DIST_VER}/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}

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

+    gzip ${K8S_TAR_NAME}

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

 done

 rm -rf ./tmp

@@ -13,6 +13,8 @@ K8S_VER=`cat ${SPEC_DIR}/kubernetes/kubernetes.spec | grep Version | cut -d: -f2

 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}

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

+K8S_PAUSE_RPM_FILE=../../../stage/RPMS/x86_64/${K8S_PAUSE_RPM}

 if [ ! -f ${K8S_RPM_FILE} ]

 then

@@ -22,7 +24,7 @@ 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_NAME=vmware_photon_${DIST_VER}/${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}"

@@ -32,16 +34,37 @@ done

 mkdir -p tmp/k8s

 cp ${K8S_RPM_FILE} tmp/k8s/

+cp ${K8S_PAUSE_RPM_FILE} tmp/k8s/

 pushd ./tmp/k8s

 rpm2cpio ${K8S_RPM} | cpio -vid

+rpm2cpio ${K8S_PAUSE_RPM} | cpio -vid

 popd

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

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

+    IMG_NAME=vmware_photon_${DIST_VER}/${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}/

+    gzip ${K8S_TAR_NAME}

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

 done

+

+#

+# K8S Pause container

+#

+PAUSE_IMG_NAME=vmware_photon_${DIST_VER}/pause-amd64:v${K8S_VER}

+PAUSE_TAR_NAME=k8s-pause.tar

+

+PAUSE_IMG_ID=`docker images -q ${PAUSE_IMG_NAME} 2> /dev/null`

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

+    echo "Removing image ${PAUSE_IMG_NAME}"

+    docker rmi -f ${PAUSE_IMG_NAME}

+fi

+

+docker build --rm -t ${PAUSE_IMG_NAME} -f ./Dockerfile.pause .

+docker save -o ${PAUSE_TAR_NAME} ${PAUSE_IMG_NAME}

+gzip ${PAUSE_TAR_NAME}

+mv -f ${PAUSE_TAR_NAME}.gz ${STAGE_DIR}/

+

 rm -rf ./tmp