starlingx/integ
Code Issues Proposed changes

Merge "Upversion kubernetes build files to 1.15.3"

Browse Source
This commit is contained in:
Zuul 2019-08-22 15:38:00 +00:00 committed by Gerrit Code Review
commit 9b2a6dbc18
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
kubernetes/kubernetes/centos/files/kubelet-cgroup-setup.sh
View File

@ -27,13 +27,14 @@ function ERROR {
} }
# Create minimal cgroup directories and configure cpuset attributes # Create minimal cgroup directories and configure cpuset attributes
# pids should be first in the list, since it appears to get auto deleted
function create_cgroup { function create_cgroup {
local cg_name=$1 local cg_name=$1
local cg_nodeset=$2 local cg_nodeset=$2
local cg_cpuset=$3 local cg_cpuset=$3
local CGROUP=/sys/fs/cgroup local CGROUP=/sys/fs/cgroup
local CONTROLLERS=("cpuset" "memory" "cpu,cpuacct" "systemd") local CONTROLLERS=("pids" "cpuset" "memory" "cpu,cpuacct" "systemd")
local cnt='' local cnt=''
local CGDIR='' local CGDIR=''
local RC=0 local RC=0

10
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.13.5 %global commit 1.15.3
%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.13.5 %global con_commit 1.15.3
%global kube_version 1.13.5 %global kube_version 1.15.3
%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.2-7 Requires: golang >= 1.12.9
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.2-7 BuildRequires: golang >= 1.12.9
BuildRequires: systemd BuildRequires: systemd
BuildRequires: rsync BuildRequires: rsync
BuildRequires: go-md2man BuildRequires: go-md2man