From: Levente Kálé <levente.kale@nokia.com>
Date: Tue, 15 Oct 2019 12:09:59 +0000 (+0000)
Subject: Merge "CVE-2019-16276 Vulnerability fix."
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-helm.git;a=commitdiff_plain;h=14c3d7f410dc71ce5b6c8947c72b7c52b1f9e042;hp=-c

Merge "CVE-2019-16276 Vulnerability fix."
---

14c3d7f410dc71ce5b6c8947c72b7c52b1f9e042
diff --combined SPECS/caas-chartrepo.spec
index 664e0c0,b4524c4..9bc2b66
--- a/SPECS/caas-chartrepo.spec
+++ b/SPECS/caas-chartrepo.spec
@@@ -15,8 -15,8 +15,8 @@@
  %define COMPONENT chartrepo
  %define RPM_NAME caas-%{COMPONENT}
  %define RPM_MAJOR_VERSION 1.0.0
- %define RPM_MINOR_VERSION 10
- %define go_version 1.12.9
+ %define RPM_MINOR_VERSION 11
+ %define go_version 1.12.10
  %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
  %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
  %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
@@@ -26,7 -26,7 +26,7 @@@ Version:        %{RPM_MAJOR_VERSION
  Release:        %{RPM_MINOR_VERSION}%{?dist}
  Summary:        Containers as a Service %{COMPONENT} component
  License:        %{_platform_licence} and MIT license and BSD and Apache License and Lesser General Public License
 -BuildArch:      x86_64
 +BuildArch:      %{_arch}
  Vendor:         %{_platform_vendor} and kubernetes/kubernetes unmodified
  Source0:        %{name}-%{version}.tar.gz
  
diff --combined SPECS/caas-helm.spec
index 9c73599,ae9dcb6..b68aa28
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@@ -15,26 -15,25 +15,26 @@@
  %define COMPONENT helm
  %define RPM_NAME caas-%{COMPONENT}
  %define RPM_MAJOR_VERSION 2.14.3
- %define RPM_MINOR_VERSION 3
+ %define RPM_MINOR_VERSION 4
  %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
- %define go_version 1.12.9
+ %define go_version 1.12.10
  %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
  %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
  %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
  %define built_binaries_dir /binary-save
 +%define centos_build 191001
  
  Name:           %{RPM_NAME}
  Version:        %{RPM_MAJOR_VERSION}
  Release:        %{RPM_MINOR_VERSION}%{?dist}
  Summary:        Containers as a Service %{COMPONENT} component
  License:        %{_platform_licence} and MIT license and BSD and Apache License and Lesser General Public License
 -BuildArch:      x86_64
 +BuildArch:      %{_arch}
  Vendor:         %{_platform_vendor} and helm/helm unmodified
  Source0:        %{name}-%{version}.tar.gz
  
  Requires: docker-ce >= 18.09.2, rsync
 -BuildRequires: docker-ce-cli >= 18.09.2, rsync, xz
 +BuildRequires: docker-ce-cli >= 18.09.2, rsync, xz, wget
  
  %description
  This rpm contains the %{COMPONENT} container for CaaS subsystem.
@@@ -44,7 -43,6 +44,7 @@@ This container contains the %{COMPONENT
  %autosetup
  
  %build
 +wget --progress=dot:giga http://artifacts.ci.centos.org/sig-cloudinstance/centos-7-%{centos_build}/%{_arch}/centos-7-%{_arch}-docker.tar.xz -O %{docker_build_dir}/helm-builder/centos-7-docker.tar.xz
  # Build Helm binaries
  docker build \
    --network=host \