starlingx
/
integ
Code Issues Proposed changes

Merge "Upversion to kubernetes 1.13.5 and helm 2.13.1"

This commit is contained in:
Zuul 2019-04-03 20:33:27 +00:00 committed by Gerrit Code Review
parent 27133180fe ce13ffe1f2
commit 1ec58b3473
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="$TAR_NAME-v$VERSION-linux-amd64.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"

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

@ -1,5 +1,5 @@
Name: helm
Version: 2.12.1
Version: 2.13.1
Release: 0%{?_tis_dist}.%{tis_patch_ver}
Summary: The Kubernetes Package Manager
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
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
CON_VERSION=1.12.1
VERSION=1.13.5
CON_VERSION=1.13.5
TAR_NAME=kubernetes
TAR="$TAR_NAME-v$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 import_path k8s.io/kubernetes
%global commit 1.12.3
%global commit 1.13.5
%global con_provider github
%global con_provider_tld com
%global con_project kubernetes
%global con_repo 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}
# Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work