diff --git a/kubernetes/helm/centos/build_srpm.data b/kubernetes/helm/centos/build_srpm.data index 5b5e2884d..19be238cc 100644 --- a/kubernetes/helm/centos/build_srpm.data +++ b/kubernetes/helm/centos/build_srpm.data @@ -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/*" diff --git a/kubernetes/helm/centos/helm.spec b/kubernetes/helm/centos/helm.spec index 22322c959..c551812e9 100644 --- a/kubernetes/helm/centos/helm.spec +++ b/kubernetes/helm/centos/helm.spec @@ -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 diff --git a/kubernetes/kubernetes/centos/Readme.rst b/kubernetes/kubernetes/centos/Readme.rst index 350d6a8f8..6e819fedf 100644 --- a/kubernetes/kubernetes/centos/Readme.rst +++ b/kubernetes/kubernetes/centos/Readme.rst @@ -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. diff --git a/kubernetes/kubernetes/centos/build_srpm.data b/kubernetes/kubernetes/centos/build_srpm.data index cd5899b88..8bb697d7e 100644 --- a/kubernetes/kubernetes/centos/build_srpm.data +++ b/kubernetes/kubernetes/centos/build_srpm.data @@ -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" diff --git a/kubernetes/kubernetes/centos/kubernetes.spec b/kubernetes/kubernetes/centos/kubernetes.spec index 619ced102..727099004 100644 --- a/kubernetes/kubernetes/centos/kubernetes.spec +++ b/kubernetes/kubernetes/centos/kubernetes.spec @@ -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