X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=caas-kubernetes.spec;h=074e6beb3d3cd76a617cd9e782cb0057f1e31a66;hb=809478b4ae36c63ae236d4e9523acd5f4fc30102;hp=57050ffe8492d71d71d68258eba4c163d8a514d6;hpb=676b50ba557c1dee047c2b3872e79992d0e533f1;p=ta%2Fcaas-kubernetes.git

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 57050ff..074e6be 100644
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -14,17 +14,18 @@
 
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.15.3
-%define RPM_MINOR_VERSION 6
+%define RPM_MAJOR_VERSION 1.16.2
+%define RPM_MINOR_VERSION 7
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1
 
-%define go_version 1.12.9
+%define go_version 1.12.10
 %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
 %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}
@@ -36,7 +37,7 @@ Vendor:         %{_platform_vendor} and kubernetes/kubernetes unmodified
 Source0:        %{name}-%{version}.tar.gz
 
 Requires: docker-ce >= 18.09.2, rsync
-BuildRequires: docker-ce-cli >= 18.09.2, xz
+BuildRequires: docker-ce-cli >= 18.09.2, xz, wget
 
 # more info at: https://fedoraproject.org/wiki/Packaging:Debuginfo No build ID note in Flannel
 %global debug_package %{nil}
@@ -50,6 +51,7 @@ This container contains the %{COMPONENT} service.
 
 # Build Kubernetes binaries
 %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}/kubernetes-builder/centos-7-docker.tar.xz
 set -x
 docker build \
   --network=host \
@@ -81,6 +83,7 @@ docker rm -f ${builder_container}
 docker rmi kubernetes-builder:%{IMAGE_TAG}
 
 # Build hyperkube container image
+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}/hyperkube/centos-7-docker.tar.xz
 rsync -av %{binary_build_dir}/kube-apiserver %{docker_build_dir}/hyperkube/
 rsync -av %{binary_build_dir}/kube-controller-manager %{docker_build_dir}/hyperkube/
 rsync -av %{binary_build_dir}/kube-proxy %{docker_build_dir}/hyperkube/
@@ -155,11 +158,11 @@ ln -s %{_playbooks_path}/kube_secret_key_creation.yaml      %{_postconfig_path}/
 ln -s %{_playbooks_path}/kube_secret_key_distribution.yaml  %{_postconfig_path}/
 ln -s %{_playbooks_path}/kube_token_creation.yaml           %{_postconfig_path}/
 ln -s %{_playbooks_path}/kube_token_distribution.yaml       %{_postconfig_path}/
-ln -s %{_playbooks_path}/kubernetes_ceph.yaml               %{_postconfig_path}/
 ln -s %{_playbooks_path}/master_kube_proxy.yaml             %{_postconfig_path}/
 ln -s %{_playbooks_path}/master_kubelet.yaml                %{_postconfig_path}/
 ln -s %{_playbooks_path}/service_account_creation.yaml      %{_postconfig_path}/
 ln -s %{_playbooks_path}/service_account_distribution.yaml  %{_postconfig_path}/
+ln -s %{_playbooks_path}/set_nodes_label.yaml               %{_postconfig_path}/
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -170,11 +173,11 @@ if [ $1 -eq 0 ]; then
   rm -f %{_postconfig_path}/kube_secret_key_distribution.yaml
   rm -f %{_postconfig_path}/kube_token_creation.yaml
   rm -f %{_postconfig_path}/kube_token_distribution.yaml
-  rm -f %{_postconfig_path}/kubernetes_ceph.yaml
   rm -f %{_postconfig_path}/master_kube_proxy.yaml
   rm -f %{_postconfig_path}/master_kubelet.yaml
   rm -f %{_postconfig_path}/service_account_creation.yaml
   rm -f %{_postconfig_path}/service_account_distribution.yaml
+  rm -f %{_postconfig_path}/set_nodes_label.yaml
 fi
 
 %clean