From aaa103a1108fac54722aa1c86f000d3dc887342a Mon Sep 17 00:00:00 2001
From: Dongqi Chen <chen.dq@neusoft.com>
Date: Tue, 24 Dec 2019 16:58:43 +0800
Subject: [PATCH] CentOS 8: kubernetes should use python3

Change python to python3

Story: 2006729
Task: 37880
Change-Id: I7616dd2ad4fbbccd159d75eb1bc423082545f45b
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
Signed-off-by: SidneyAn <ran1.an@intel.com>
---
 ...1-STX-specify-the-python-interpreter.patch | 80 +++++++++++++++++++
 kubernetes/kubernetes/centos/kubernetes.spec  |  4 +
 2 files changed, 84 insertions(+)
 create mode 100644 kubernetes/kubernetes/centos/files/0001-STX-specify-the-python-interpreter.patch

diff --git a/kubernetes/kubernetes/centos/files/0001-STX-specify-the-python-interpreter.patch b/kubernetes/kubernetes/centos/files/0001-STX-specify-the-python-interpreter.patch
new file mode 100644
index 000000000..9216bfb01
--- /dev/null
+++ b/kubernetes/kubernetes/centos/files/0001-STX-specify-the-python-interpreter.patch
@@ -0,0 +1,80 @@
+From 60780d3f934b9dd14bcd80fe604d6eb37b7c3349 Mon Sep 17 00:00:00 2001
+From: SidneyAn <ran1.an@intel.com>
+Date: Wed, 22 Jan 2020 02:46:03 +0000
+Subject: [PATCH] STX: specify the python interpreter
+
+Change python to python3 explicitly in line #!/usr/bin/env python
+
+Signed-off-by: SidneyAn <ran1.an@intel.com>
+---
+ src/k8s.io/kubernetes/hack/boilerplate/boilerplate.py      | 2 +-
+ src/k8s.io/kubernetes/hack/boilerplate/boilerplate_test.py | 2 +-
+ src/k8s.io/kubernetes/hack/boilerplate/test/fail.py        | 2 +-
+ src/k8s.io/kubernetes/hack/boilerplate/test/pass.py        | 2 +-
+ src/k8s.io/kubernetes/hack/verify-flags-underscore.py      | 2 +-
+ src/k8s.io/kubernetes/hack/verify-publishing-bot.py        | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.py b/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.py
+index d5d901ee..1f843cbf 100755
+--- a/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.py
++++ b/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright 2015 The Kubernetes Authors.
+ #
+diff --git a/src/k8s.io/kubernetes/hack/boilerplate/boilerplate_test.py b/src/k8s.io/kubernetes/hack/boilerplate/boilerplate_test.py
+index 66453045..fc049ca2 100644
+--- a/src/k8s.io/kubernetes/hack/boilerplate/boilerplate_test.py
++++ b/src/k8s.io/kubernetes/hack/boilerplate/boilerplate_test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright 2016 The Kubernetes Authors.
+ #
+diff --git a/src/k8s.io/kubernetes/hack/boilerplate/test/fail.py b/src/k8s.io/kubernetes/hack/boilerplate/test/fail.py
+index cbdd06ff..e59627aa 100644
+--- a/src/k8s.io/kubernetes/hack/boilerplate/test/fail.py
++++ b/src/k8s.io/kubernetes/hack/boilerplate/test/fail.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright 2015 The Kubernetes Authors.
+ #
+diff --git a/src/k8s.io/kubernetes/hack/boilerplate/test/pass.py b/src/k8s.io/kubernetes/hack/boilerplate/test/pass.py
+index 5b7ce29a..0a0f9c9d 100644
+--- a/src/k8s.io/kubernetes/hack/boilerplate/test/pass.py
++++ b/src/k8s.io/kubernetes/hack/boilerplate/test/pass.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright 2015 The Kubernetes Authors.
+ #
+diff --git a/src/k8s.io/kubernetes/hack/verify-flags-underscore.py b/src/k8s.io/kubernetes/hack/verify-flags-underscore.py
+index 169f7944..9d97ad9f 100755
+--- a/src/k8s.io/kubernetes/hack/verify-flags-underscore.py
++++ b/src/k8s.io/kubernetes/hack/verify-flags-underscore.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright 2015 The Kubernetes Authors.
+ #
+diff --git a/src/k8s.io/kubernetes/hack/verify-publishing-bot.py b/src/k8s.io/kubernetes/hack/verify-publishing-bot.py
+index dc8c3d79..ba816939 100755
+--- a/src/k8s.io/kubernetes/hack/verify-publishing-bot.py
++++ b/src/k8s.io/kubernetes/hack/verify-publishing-bot.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright 2019 The Kubernetes Authors.
+ #
+-- 
+2.18.1
+
diff --git a/kubernetes/kubernetes/centos/kubernetes.spec b/kubernetes/kubernetes/centos/kubernetes.spec
index ce3a68a24..ff3f474f8 100644
--- a/kubernetes/kubernetes/centos/kubernetes.spec
+++ b/kubernetes/kubernetes/centos/kubernetes.spec
@@ -63,6 +63,9 @@ Obsoletes:      cadvisor
 Requires: kubernetes-master
 Requires: kubernetes-node
 
+# STX Patches
+Patch000:  0001-STX-specify-the-python-interpreter.patch
+
 %description
 %{summary}
 
@@ -855,6 +858,7 @@ done
 mkdir -p src/k8s.io/kubernetes
 mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
 
+%patch000 -p1
 ###############
 
 %build