From 2ab04bc375fb20431096c6d6d2a178dc1eed73f6 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 16 Oct 2019 09:20:51 -0500
Subject: [PATCH] Upversion kubernetes to 1.16.2

This is a minor bugfix release.
It requires golang 1.12.10 to build.

Change-Id: I3eb4818d4667ff3be1020a2066c52ed248d5e23c
Story: 2005860
Task: 37159
Depends-On: https://review.opendev.org/#/c/689000/
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
---
 kubernetes/kubernetes/centos/build_srpm.data |  6 +++---
 kubernetes/kubernetes/centos/kubernetes.spec | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kubernetes/kubernetes/centos/build_srpm.data b/kubernetes/kubernetes/centos/build_srpm.data
index 2f9a408ec..8079df04a 100644
--- a/kubernetes/kubernetes/centos/build_srpm.data
+++ b/kubernetes/kubernetes/centos/build_srpm.data
@@ -1,9 +1,9 @@
-VERSION=1.16.0
-CON_VERSION=1.16.0
+VERSION=1.16.2
+CON_VERSION=1.16.2
 TAR_NAME=kubernetes
 TAR="$TAR_NAME-v$VERSION.tar.gz"
 CONTRIB="$TAR_NAME-contrib-v$CON_VERSION.tar.gz"
 
 COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB  $FILES_BASE/*"
 
-TIS_PATCH_VER=2
+TIS_PATCH_VER=1
diff --git a/kubernetes/kubernetes/centos/kubernetes.spec b/kubernetes/kubernetes/centos/kubernetes.spec
index e8b93a105..ce3a68a24 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.16.0
+%global commit                  1.16.2
 
 %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.16.0
+%global con_commit              1.16.2
 
-%global kube_version            1.16.0
+%global kube_version            1.16.2
 %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.12.9
+Requires: golang >= 1.12.10
 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.12.9
+BuildRequires: golang >= 1.12.10
 BuildRequires: systemd
 BuildRequires: rsync
 BuildRequires: go-md2man
@@ -798,7 +798,7 @@ Requires: docker-ce
 %endif
 Requires: conntrack-tools
 
-BuildRequires: golang >=  1.10.2
+BuildRequires: golang >=  1.12.10
 BuildRequires: systemd
 BuildRequires: rsync
 BuildRequires: go-md2man
@@ -824,7 +824,7 @@ Kubernetes tool for standing up clusters
 %package client
 Summary: Kubernetes client tools
 
-BuildRequires: golang >= 1.2-7
+BuildRequires: golang >= 1.12.10
 BuildRequires: go-bindata
 
 %description client