X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=caas-kubernetes.spec;h=eeffa0258f7f993dcd2393fa67033802f5ff6f00;hb=62c15547ea0bce6f1dc1b7d845ed11e6db594d49;hp=4323fa540f52123d9c38e9b27b208fdf0e682e2e;hpb=df3fea70cdc2661a7cfd5fbadcbc5a857b7c6413;p=ta%2Fcaas-kubernetes.git

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 4323fa5..eeffa02 100644
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -14,12 +14,12 @@
 
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.14.0
-%define RPM_MINOR_VERSION 3
+%define RPM_MAJOR_VERSION 1.15.3
+%define RPM_MINOR_VERSION 4
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1
 
-%define go_version 1.12.1
+%define go_version 1.12.9
 %define ceph_version 12.2.5
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
@@ -35,8 +35,8 @@ BuildArch:      x86_64
 Vendor:         %{_platform_vendor} and kubernetes/kubernetes unmodified
 Source0:        %{name}-%{version}.tar.gz
 
-Requires: docker-ce >= 18.09.2
-BuildRequires: docker-ce-cli >= 18.09.2
+Requires: docker-ce >= 18.09.2, rsync
+BuildRequires: docker-ce-cli >= 18.09.2, xz
 
 # more info at: https://fedoraproject.org/wiki/Packaging:Debuginfo No build ID note in Flannel
 %global debug_package %{nil}
@@ -99,7 +99,7 @@ docker build \
   --tag hyperkube:%{IMAGE_TAG} \
   %{docker_build_dir}/hyperkube
 mkdir -p %{docker_save_dir}
-docker save hyperkube:%{IMAGE_TAG} | gzip -c > "%{docker_save_dir}/hyperkube:%{IMAGE_TAG}.tar"
+docker save hyperkube:%{IMAGE_TAG} | xz -z -T2 > "%{docker_save_dir}/hyperkube:%{IMAGE_TAG}.tar"
 docker rmi hyperkube:%{IMAGE_TAG}
 
 # Build kubernetes pause container image
@@ -117,7 +117,7 @@ docker build \
   --tag kubernetespause:%{IMAGE_TAG} \
   %{docker_build_dir}/kubernetespause
 mkdir -p %{docker_save_dir}
-docker save kubernetespause:%{IMAGE_TAG} | gzip -c > "%{docker_save_dir}/kubernetespause:%{IMAGE_TAG}.tar"
+docker save kubernetespause:%{IMAGE_TAG} | xz -z -T2 > "%{docker_save_dir}/kubernetespause:%{IMAGE_TAG}.tar"
 docker rmi kubernetespause:%{IMAGE_TAG}
 
 %install