@@ -403,7 +403,8 @@ k8s-docker-images:

 	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)

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

+	./build-flannel-docker-image.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE)

 install-photon-docker-image: photon-docker-image

 	sudo docker build -t photon:tdnf .

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

 Summary:        Overlay network for containers based on etcd

 Name:           flannel

-Version:        0.5.5

-Release:        2%{?dist}

+Version:        0.8.0

+Release:        1%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/coreos/flannel

-Source0:        https://github.com/coreos/flannel/archive/%{name}-%{version}.zip

-%define sha1 flannel=835f5743510982ad436a2e030ea706c95262862a

+Source0:        https://github.com/coreos/flannel/archive/%{name}-%{version}.tar.gz

+%define sha1 flannel=d8eb057233de1babd306297d4fc3af098ccbea16

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -14,6 +14,7 @@ BuildRequires:  gcc

 BuildRequires:  unzip

 BuildRequires:  go

 Requires:       etcd >= 2.0.0

+%define debug_package %{nil}

 %description

 flannel is a virtual network that provides a subnet to a container runtime

@@ -21,17 +22,68 @@ host OS for use with containers. flannel uses etcd to store the network

 configuration, allocated subnets, and additional data.

 %prep

-%setup -n %{name}-%{version}

+%setup -cqn src/github.com/coreos/

 %build

-./build

+export GOPATH=%{_builddir}

+echo $GOAPTH

+mv %{name}-%{version}  %{name}

+pushd %{name}

+make dist/flanneld

+popd

 %install

 install -vdm 755 %{buildroot}%{_bindir}

-install -vpm 0755 -t %{buildroot}%{_bindir}/ bin/flanneld

+install -vpm 0755 -t %{buildroot}%{_bindir}/ %{name}/dist/flanneld

+

+install -vdm 0755 %{buildroot}/usr/share/flannel/docker

+install -vpm 0755 -t %{buildroot}/usr/share/flannel/docker/ %{name}/dist/mk-docker-opts.sh

+

+install -vdm 0755 %{buildroot}%{_sysconfdir}/flannel

+cat << EOF >> %{buildroot}%{_sysconfdir}/flannel/flanneld

+###

+# flanneld configuration

+#

+

+# etcd endpoints

+ETCD_ENDPOINTS="http://127.0.0.1:4001,http://127.0.0.1:2379"

+

+# flannel network config

+FLANNEL_NETWORK_CONF='{"Network": "172.17.0.0/16"}'

+

+# kubernetes api server URL

+KUBE_API_URL="http://localhost:8080"

+

+# additional flannel options

+FLANNEL_OPTIONS=""

+EOF

+

+mkdir -p %{buildroot}/usr/lib/systemd/system

+cat << EOF >> %{buildroot}/usr/lib/systemd/system/flanneld.service

+[Unit]

+Description=flanneld overlay network service

+After=network.target etcd.service

+Before=docker.service

+

+[Service]

+Type=notify

+EnvironmentFile=-/etc/flannel/flanneld

+ExecStartPre=/usr/bin/etcdctl mk /vmware/network/config \${FLANNEL_NETWORK_CONF}

+ExecStart=/usr/bin/flanneld -etcd-prefix=/vmware/network -etcd-endpoints=\${ETCD_ENDPOINTS} --kube-api-url=\${KUBE_API_URL} \${FLANNEL_OPTIONS}

+ExecStopPost=/usr/bin/etcdctl rm /vmware/network/config

+Restart=on-failure

+

+[Install]

+WantedBy=multi-user.target

+RequiredBy=docker.service

+EOF

 %check

-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+pushd %{name}

+go get golang.org/x/tools/cmd/cover

+sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go || die

+./test

+popd

 %post

@@ -40,11 +92,17 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %files

 %defattr(-,root,root)

 %{_bindir}/flanneld

+%{_libdir}/systemd/system/flanneld.service

+%{_sysconfdir}/flannel/flanneld

+/usr/share/flannel/docker/mk-docker-opts.sh

+%config(noreplace) %{_sysconfdir}/flannel/flanneld

 %changelog

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.5.5-2

--	GA - Bump release of all rpms

-*   	 Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.5.5-1

--   	 Upgraded to version 0.5.5

-*        Mon Aug 03 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.5.2-1

--        Add flannel package to photon.

+*   Fri Aug 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.8.0-1

+-   Flannel 0.8.0 and systemd service file.

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.5.5-2

+-   GA - Bump release of all rpms

+*   Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.5.5-1

+-   Upgraded to version 0.5.5

+*   Mon Aug 03 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.5.2-1

+-   Add flannel package to photon.

new file mode 100644

@@ -0,0 +1,12 @@

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+ENV FLANNEL_ARCH=amd64

+

+RUN tdnf install -y iproute2 net-tools iptables

+ADD tmp/flannel/usr/bin/flanneld /opt/bin/flanneld

+COPY tmp/flannel/usr/share/flannel/docker/mk-docker-opts.sh /opt/bin/

+RUN ln -s /usr/sbin/iptables /usr/local/bin/iptables

+

+ENTRYPOINT ["/opt/bin/flanneld"]

new file mode 100755

@@ -0,0 +1,41 @@

+#!/bin/bash -e

+

+DIST_TAG=$1

+DIST_VER=$2

+SPEC_DIR=$3

+STAGE_DIR=$4

+ARCH=x86_64

+

+#

+# Docker image for flannel

+#

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

+FLANNEL_VER_REL=${FLANNEL_VER}-`cat ${SPEC_DIR}/flannel/flannel.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

+FLANNEL_RPM=flannel-${FLANNEL_VER_REL}${DIST_TAG}.${ARCH}.rpm

+FLANNEL_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${FLANNEL_RPM}

+FLANNEL_TAR=flannel.tar

+

+if [ ! -f ${FLANNEL_RPM_FILE} ]

+then

+    echo "flannel RPM ${FLANNEL_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

+IMG_NAME=vmware_photon/flannel:v${FLANNEL_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

+

+mkdir -p tmp/flannel

+cp ${FLANNEL_RPM_FILE} tmp/flannel/

+pushd ./tmp/flannel

+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}/

+

+rm -rf ./tmp