From 70a510bd0442f6e8c4e742d27ab4188725e3c96a Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 9 Jul 2019 07:49:13 -0500
Subject: [PATCH] Upversion kubernetes build files to 1.15.3

The spec file and srpm data files reflect the newer
kubernetes 1.15.3 src tarball.

The newer version of kubernetes requires the appropriate
cgroups "pids" folder to be populated.  The pids subfolder
is removed more frequently than the other cgroups folders,
so it is the first in the list.

This version of kubernetes requires golang 1.12.9 or higher

Change-Id: I3a965056828920190139b6ef6c963888b61e5cb1
Story: 2005860
Task: 33655
Depends-On: https://review.opendev.org/#/c/671147
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
---
 kubernetes/kubernetes/centos/build_srpm.data           |  4 ++--
 .../kubernetes/centos/files/kubelet-cgroup-setup.sh    |  3 ++-
 kubernetes/kubernetes/centos/kubernetes.spec           | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kubernetes/kubernetes/centos/build_srpm.data b/kubernetes/kubernetes/centos/build_srpm.data
index 8bb697d7e..ddcbf293a 100644
--- a/kubernetes/kubernetes/centos/build_srpm.data
+++ b/kubernetes/kubernetes/centos/build_srpm.data
@@ -1,5 +1,5 @@
-VERSION=1.13.5
-CON_VERSION=1.13.5
+VERSION=1.15.3
+CON_VERSION=1.15.3
 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/files/kubelet-cgroup-setup.sh b/kubernetes/kubernetes/centos/files/kubelet-cgroup-setup.sh
index 202348a89..7efb27a64 100644
--- a/kubernetes/kubernetes/centos/files/kubelet-cgroup-setup.sh
+++ b/kubernetes/kubernetes/centos/files/kubelet-cgroup-setup.sh
@@ -27,13 +27,14 @@ function ERROR {
 }
 
 # 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 {
     local cg_name=$1
     local cg_nodeset=$2
     local cg_cpuset=$3
 
     local CGROUP=/sys/fs/cgroup
-    local CONTROLLERS=("cpuset" "memory" "cpu,cpuacct" "systemd")
+    local CONTROLLERS=("pids" "cpuset" "memory" "cpu,cpuacct" "systemd")
     local cnt=''
     local CGDIR=''
     local RC=0
diff --git a/kubernetes/kubernetes/centos/kubernetes.spec b/kubernetes/kubernetes/centos/kubernetes.spec
index 23cca76c7..6fcb6502b 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.13.5
+%global commit                  1.15.3
 
 %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.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}
 
 # 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
 
 # below Rs used for testing
-Requires: golang >= 1.2-7
+Requires: golang >= 1.12.9
 Requires: etcd >= 2.0.9
 Requires: hostname
 Requires: rsync
@@ -774,7 +774,7 @@ Requires: NetworkManager
 %package master
 Summary: Kubernetes services for master host
 
-BuildRequires: golang >= 1.2-7
+BuildRequires: golang >= 1.12.9
 BuildRequires: systemd
 BuildRequires: rsync
 BuildRequires: go-md2man