starlingx/integ
Code Issues Proposed changes

Upversion to kubernetes 1.13.5 and helm 2.13.1

Browse Source 
Updated the spec file and src version.

Story: 2005198
Task: 30209
Depends-On: I8b6f7bf14afda36ee8c558175598f3e810506fe8
Change-Id: If9476b26b315e8c863e1ec487cbf701972a82a98
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-03-26 14:36:24 -05:00
parent 98f2ff7bf4
commit ce13ffe1f2
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kubernetes/helm/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
VERSION=2.12.1 VERSION=2.13.1
TAR_NAME=helm TAR_NAME=helm
TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz" TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"

2
kubernetes/helm/centos/helm.spec
View File

@ -1,5 +1,5 @@
Name: helm Name: helm
Version: 2.12.1 Version: 2.13.1
Release: 0%{?_tis_dist}.%{tis_patch_ver} Release: 0%{?_tis_dist}.%{tis_patch_ver}
Summary: The Kubernetes Package Manager Summary: The Kubernetes Package Manager
License: Apache-2.0 License: Apache-2.0

2
kubernetes/kubernetes/centos/Readme.rst
View File

@ -5,3 +5,5 @@ assist with future upversioning.
The contrib tarball does not have the same versioning as kubernetes and The contrib tarball does not have the same versioning as kubernetes and
there is little activity in that repo. there is little activity in that repo.
The version for the contrib tarball is arbitrary.

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

@ -1,5 +1,5 @@
VERSION=1.12.3 VERSION=1.13.5
CON_VERSION=1.12.1 CON_VERSION=1.13.5
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"

6
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.12.3 %global commit 1.13.5
%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.12.1 %global con_commit 1.13.5
%global kube_version 1.12.3 %global kube_version 1.13.5
%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