@@ -442,6 +442,7 @@ k8s-docker-images: start-docker photon-docker-image

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

 	./build-k8s-base-image.sh $(PHOTON_RELEASE_VERSION) $(PHOTON_BUILD_NUMBER) $(PHOTON_STAGE)  && \

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

+	./build-k8s-metrics-server-image.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-flannel-docker-image.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

@@ -1,16 +1,14 @@

 Summary:        Contains a linker, an assembler, and other tools

 Name:           binutils

-Version:        2.30

-Release:        4%{?dist}

+Version:        2.31

+Release:        1%{?dist}

 License:        GPLv2+

 URL:            http://www.gnu.org/software/binutils

 Group:          System Environment/Base

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.xz

-%define sha1 binutils=574d3b5650413d6ee65195a4f5ecbddc3a38f718

-Patch0:         binutils-2.30-CVE-2018-6543.patch

-Patch1:         binutils-2.30-CVE-2018-10373.patch

+%define sha1 binutils=e1a564cd356d2126d2e9a59e8587757634e731aa

 %description

 The Binutils package contains a linker, an assembler,

 and other tools for handling object files.

@@ -22,8 +20,6 @@ It contains the libraries and header files to create applications

 for handling compiled objects.

 %prep

 %setup -q

-%patch0 -p1

-%patch1 -p1

 %build

 install -vdm 755 ../binutils-build

 cd ../binutils-build

@@ -80,7 +76,6 @@ make %{?_smp_mflags} check

 %{_mandir}/man1/windmc.1.gz

 %{_mandir}/man1/ranlib.1.gz

 %{_mandir}/man1/gprof.1.gz

-%{_mandir}/man1/nlmconv.1.gz

 %{_mandir}/man1/strip.1.gz

 %{_mandir}/man1/c++filt.1.gz

 %{_mandir}/man1/as.1.gz

@@ -106,6 +101,7 @@ make %{?_smp_mflags} check

 %{_includedir}/bfdlink.h

 %{_includedir}/dis-asm.h

 %{_includedir}/libiberty/*

+%{_includedir}/diagnostics.h

 %{_libdir}/libbfd.a

 %{_libdir}/libopcodes.a

 %{_libdir}/libbfd.so

@@ -113,6 +109,8 @@ make %{?_smp_mflags} check

 %{_lib64dir}/libiberty.a

 %changelog

+*   Wed Aug 1 2018 Keerthana K <keerthanak@vmware.com> 2.31-1

+-   Update to version 2.31.

 *   Thu Jun 7 2018 Keerthana K <keerthanak@vmware.com> 2.30-4

 -   Fix CVE-2018-10373

 *   Mon Mar 19 2018 Alexey Makhalov <amakhalov@vmware.com> 2.30-3

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

 Summary:        Fast distributed version control system

 Name:           git

 Version:        2.14.2

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2

 URL:            http://git-scm.com/

 Group:          System Environment/Programming

@@ -86,12 +86,14 @@ rm -rf %{buildroot}/*

 %exclude %{_mandir}/man3/*:SVN:*

 %exclude %{perl_sitelib}/Git/SVN

 %exclude %{perl_sitelib}/Git/SVN.pm

-%exclude /usr/lib/perl5/5.24.1/x86_64-linux-thread-multi/perllocal.pod

+%exclude /usr/lib/perl5/5.24.1/*/perllocal.pod

 %files lang -f %{name}.lang

 %defattr(-,root,root)

 %changelog

+*   Tue Jul 31 2018 Ajay Kaher <akaher@vmware.com> 2.14.2-2

+-   Excluded the perllocal.pod for aarch64.

 *   Thu Oct 12 2017 Anish Swaminathan <anishs@vmware.com> 2.14.2-1

 -   Updated to version 2.14.2, fix CVE-2017-14867

 *   Mon Aug 21 2017 Rui Gu <ruig@vmware.com> 2.9.3-4

new file mode 100644

@@ -0,0 +1,52 @@

+Summary:        Kubernetes Metrics Server

+Name:           kubernetes-metrics-server

+Version:        0.2.1

+Release:        1%{?dist}

+License:        Apache License 2.0

+URL:            https://github.com/kubernetes-incubator/metrics-server/%{name}-%{version}.tar.gz

+Source0:        %{name}-%{version}.tar.gz

+%define sha1    kubernetes-metrics-server-%{version}.tar.gz=ac18b1360aede4647c9dbaa72bddf735b228daf3

+Group:          Development/Tools

+Vendor:         VMware, Inc.

+Distribution:   Photon

+BuildRequires:  go

+

+%description

+In Kubernetes, resource usage metrics, such as container CPU and memory usage, are available through the Metrics API.

+These metrics can be either accessed directly by user, for example by using kubectl top command, or used by a controller

+in the cluster, e.g. Horizontal Pod Autoscaler, to make decisions.

+

+%prep -p exit

+%setup -qn metrics-server-%{version}

+

+%build

+export ARCH=amd64

+export VERSION=%{version}

+export PKG=k8s.io/dns

+export GOARCH=${ARCH}

+export GOHOSTARCH=${ARCH}

+export GOOS=linux

+export GOHOSTOS=linux

+export GOROOT=/usr/lib/golang

+export GOPATH=/usr/share/gocode

+export CGO_ENABLED=0

+mkdir -p ${GOPATH}/src/github.com/kubernetes-incubator/metrics-server

+cp -r * ${GOPATH}/src/github.com/kubernetes-incubator/metrics-server/

+pushd ${GOPATH}/src/github.com/kubernetes-incubator/metrics-server

+make build

+

+%install

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

+install -pm 755 -t %{buildroot}%{_bindir} ${GOPATH}/src/github.com/kubernetes-incubator/metrics-server/metrics-server

+

+

+%clean

+rm -rf %{buildroot}/*

+

+%files

+%defattr(-,root,root)

+%{_bindir}/metrics-server

+

+%changelog

+*   Tue Jul 10 2018 Dheeraj Shetty <dheerajs@vmware.com> 0.2.1-1

+-   kubernetes-metrics-server 0.2.1

@@ -2,7 +2,7 @@

 Summary:        Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.

 Name:           net-snmp

 Version:        5.7.3

-Release:        8%{?dist}

+Release:        9%{?dist}

 License:        BSD (like)

 URL:            http://net-snmp.sourceforge.net/

 Group:          Productivity/Networking/Other

@@ -95,9 +95,12 @@ rm -rf %{buildroot}/*

 %{_libdir}/perl5

 %{_libdir}/*.so

 %{_datadir}

-%exclude /usr/lib/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod

+%exclude /usr/lib/perl5/5.22.1/*/perllocal.pod

+%exclude /usr/lib/perl5/5.24.1/*/perllocal.pod

 %changelog

+*   Tue Jul 31 2018 Ajay Kaher <akaher@vmware.com> 5.7.3-9

+-   Excluded perllocal.pod for aarch64

 *   Mon Apr 16 2018 Xiaolin Li <xiaolinl@vmware.com> 5.7.3-8

 -   Apply patch for CVE-2018-1000116

 *   Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 5.7.3-7

new file mode 100644

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

+FROM k8s-base-image:2.0

+

+MAINTAINER dheerajs@vmware.com

+

+COPY tmp/k8smetserv/usr/bin/metrics-server /

+

+ENTRYPOINT ["/metrics-server"]

new file mode 100755

@@ -0,0 +1,43 @@

+#!/bin/bash -e

+

+DIST_TAG=$1

+DIST_VER=$2

+SPEC_DIR=$3

+STAGE_DIR=$4

+ARCH=x86_64

+

+#

+# Docker images for kubernetes-metrics-server

+#

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

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

+K8S_MET_SERV_RPM=kubernetes-metrics-server-${K8S_MET_SERV_VER_REL}${DIST_TAG}.${ARCH}.rpm

+K8S_MET_SERV_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${K8S_MET_SERV_RPM}

+K8S_MET_SERV_TAR=kubernetes-metrics-server-v${K8S_MET_SERV_VER_REL}.tar

+

+if [ ! -f ${K8S_MET_SERV_RPM_FILE} ]

+then

+    echo "Kubernetes Metrics Server RPM ${K8S_MET_SERV_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

+IMG_NAME=vmware/photon-${DIST_VER}-kubernetes-metrics-server-amd64:v${K8S_MET_SERV_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/k8smetserv

+cp ${K8S_MET_SERV_RPM_FILE} tmp/k8smetserv/

+pushd ./tmp/k8smetserv

+rpm2cpio ${K8S_MET_SERV_RPM} | cpio -vid

+popd

+

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

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

+gzip ${K8S_MET_SERV_TAR}

+mv -f ${K8S_MET_SERV_TAR}.gz ${STAGE_DIR}/docker_images/

+

+rm -rf ./tmp

@@ -216,6 +216,7 @@ def buildSRPMList(srpmPath, yamlDir, blackListPkgs, logger, singleFile=True):

         yamlFile.write("  repository: BaseOS\n")

         yamlFile.write("  name: '" + ossname + "'\n")

         yamlFile.write("  version: '" + ossversion + "-" + ossrelease + "'\n")

+        yamlFile.write("  url: 'http://www.vmware.com'\n")

         yamlFile.write("  baseos-style: rpm\n")

         yamlFile.write("  baseos-source: '" + str(srpmName) + "'\n")

         yamlFile.write("  baseos-osname: 'photon'\n")

@@ -295,7 +295,7 @@ class PackageBuilderContainer(PackageBuilderBase):

                 self.logger.debug(constants.perPackageToolChain[self.package])

                 tcUtils.installCustomToolChainRPMSinContainer(

                     containerID,

-                    constants.perPackageToolChain[self.package],

+                    constants.perPackageToolChain[self.package].get(platform.machine(), []),

                     self.package)

             listDependentPackages,listDependentPackagesParseObj, listInstalledPackages, listInstalledRPMs = (

@@ -159,7 +159,8 @@ class ToolChainUtils(object):

         print(constants.perPackageToolChain)

         if packageName in constants.perPackageToolChain:

             print(constants.perPackageToolChain[packageName])

-            self.installCustomToolChainRPMS(chrootID, constants.perPackageToolChain[packageName],

+            self.installCustomToolChainRPMS(chrootID,

+                                            constants.perPackageToolChain[packageName].get(platform.machine(), []),

                                             packageName)

     def installCustomToolChainRPMS(self, chrootID, listOfToolChainPkgs, packageName):

@@ -233,7 +233,8 @@ class constants(object):

          "openjdk10-doc",

          "openjdk10-src",

          "openjre10"],

-        [

+          {

+          "x86_64":[

             "icu-devel",

             "cups",

             "cups-devel",

@@ -273,8 +274,46 @@ class constants(object):

             "libXt-devel",

             "libXmu-devel",

             "libXrender",

-            "libXrender-devel"])

-    perPackageToolChain["apache-maven"] = ["apache-maven"]

+            "libXrender-devel"],

+         "aarch64":[

+            "icu-devel",

+            "openjdk",

+            "openjre",

+            "icu",

+            "alsa-lib",

+            "alsa-lib-devel",

+            "xcb-proto",

+            "libXdmcp-devel",

+            "libXau-devel",

+            "util-macros",

+            "xtrans",

+            "libxcb-devel",

+            "proto",

+            "libXdmcp",

+            "libxcb",

+            "libXau",

+            "xtrans-devel",

+            "libX11",

+            "libX11-devel",

+            "libXext",

+            "libXext-devel",

+            "libICE-devel",

+            "libSM",

+            "libICE",

+            "libSM-devel",

+            "libXt",

+            "libXmu",

+            "libXt-devel",

+            "libXmu-devel",

+            "libXrender",

+            "libXrender-devel"]

+          })

+

+    perPackageToolChain["apache-maven"] = {

+          "x86_64":["apache-maven"],

+          "aarch64":["apache-maven"]

+          }

+

     # List of RPMs which are not published. They will be created during the

     # build process

     listOfRPMsProvidedAfterBuild = [