starlingx/integ
Code Issues Proposed changes

Upversion kubernetes to 1.16.2

Browse Source 
This is a minor bugfix release.
It requires golang 1.12.10 to build.

Change-Id: I3eb4818d4667ff3be1020a2066c52ed248d5e23c
Story: 2005860
Task: 37159
Depends-On: https://review.opendev.org/#/c/689000/
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-10-16 09:20:51 -05:00
parent 8295196cf4
commit 2ab04bc375
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kubernetes/kubernetes/centos/build_srpm.data
View File

@ -1,9 +1,9 @@
VERSION=1.16.0 VERSION=1.16.2
CON_VERSION=1.16.0 CON_VERSION=1.16.2
TAR_NAME=kubernetes TAR_NAME=kubernetes
TAR="$TAR_NAME-v$VERSION.tar.gz" TAR="$TAR_NAME-v$VERSION.tar.gz"
CONTRIB="$TAR_NAME-contrib-v$CON_VERSION.tar.gz" CONTRIB="$TAR_NAME-contrib-v$CON_VERSION.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB $FILES_BASE/*"
TIS_PATCH_VER=2 TIS_PATCH_VER=1

14
kubernetes/kubernetes/centos/kubernetes.spec
View File

@ -23,16 +23,16 @@
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path k8s.io/kubernetes %global import_path k8s.io/kubernetes
%global commit 1.16.0 %global commit 1.16.2
%global con_provider github %global con_provider github
%global con_provider_tld com %global con_provider_tld com
%global con_project kubernetes %global con_project kubernetes
%global con_repo kubernetes-contrib %global con_repo kubernetes-contrib
# https://github.com/kubernetes/contrib # https://github.com/kubernetes/contrib
%global con_commit 1.16.0 %global con_commit 1.16.2
%global kube_version 1.16.0 %global kube_version 1.16.2
%global kube_git_version v%{kube_version} %global kube_git_version v%{kube_version}
# Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work # Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work
@ -761,7 +761,7 @@ building other packages which use %{project}/%{repo}.
Summary: %{summary} - for running unit tests Summary: %{summary} - for running unit tests
# below Rs used for testing # below Rs used for testing
Requires: golang >= 1.12.9 Requires: golang >= 1.12.10
Requires: etcd >= 2.0.9 Requires: etcd >= 2.0.9
Requires: hostname Requires: hostname
Requires: rsync Requires: rsync
@ -774,7 +774,7 @@ Requires: NetworkManager
%package master %package master
Summary: Kubernetes services for master host Summary: Kubernetes services for master host
BuildRequires: golang >= 1.12.9 BuildRequires: golang >= 1.12.10
BuildRequires: systemd BuildRequires: systemd
BuildRequires: rsync BuildRequires: rsync
BuildRequires: go-md2man BuildRequires: go-md2man
@ -798,7 +798,7 @@ Requires: docker-ce
%endif %endif
Requires: conntrack-tools Requires: conntrack-tools
BuildRequires: golang >= 1.10.2 BuildRequires: golang >= 1.12.10
BuildRequires: systemd BuildRequires: systemd
BuildRequires: rsync BuildRequires: rsync
BuildRequires: go-md2man BuildRequires: go-md2man
@ -824,7 +824,7 @@ Kubernetes tool for standing up clusters
%package client %package client
Summary: Kubernetes client tools Summary: Kubernetes client tools
BuildRequires: golang >= 1.2-7 BuildRequires: golang >= 1.12.10
BuildRequires: go-bindata BuildRequires: go-bindata
%description client %description client